Skip to content

Commit

Permalink
bump required version of kf5 to 5.42.0
Browse files Browse the repository at this point in the history
nowadays we build everything ourself so we don't need to keep the
workaround for 5 year old patches around
  • Loading branch information
lievenhey authored and milianw committed Aug 30, 2023
1 parent 25e880c commit f4a310c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ set_package_properties(

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
find_package(
KF${QT_MAJOR_VERSION}
KF${QT_MAJOR_VERSION} 5.42.0
COMPONENTS ThreadWeaver
ConfigWidgets
CoreAddons
Expand Down
10 changes: 2 additions & 8 deletions src/recordpage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,14 @@ RecordPage::RecordPage(QWidget* parent)
ui->setupUi(contents);
}

auto completion = ui->applicationName->completionObject();
ui->applicationName->comboBox()->setEditable(true);
// NOTE: workaround until https://phabricator.kde.org/D7966 has landed and we bump the required version
ui->applicationName->comboBox()->setCompletionObject(completion);
ui->applicationName->setMode(KFile::File | KFile::ExistingOnly | KFile::LocalOnly);
#if KIO_VERSION >= QT_VERSION_CHECK(5, 31, 0)

// we are only interested in executable files, so set the mime type filter accordingly
// note that exe's build with PIE are actually "shared libs"...
ui->applicationName->setMimeTypeFilters(
{QStringLiteral("application/x-executable"), QStringLiteral("application/x-sharedlib")});
#endif

ui->workingDirectory->setMode(KFile::Directory | KFile::LocalOnly);
ui->outputFile->setText(QDir::currentPath() + QDir::separator() + QStringLiteral("perf.data"));
ui->outputFile->setMode(KFile::File | KFile::LocalOnly);
Expand Down Expand Up @@ -234,9 +231,6 @@ RecordPage::RecordPage(QWidget* parent)

connect(ui->homeButton, &QPushButton::clicked, this, &RecordPage::homeButtonClicked);
connect(ui->applicationName, &KUrlRequester::textChanged, this, &RecordPage::onApplicationNameChanged);
// NOTE: workaround until https://phabricator.kde.org/D7968 has landed and we bump the required version
connect(ui->applicationName->comboBox()->lineEdit(), &QLineEdit::textChanged, this,
&RecordPage::onApplicationNameChanged);
connect(ui->startRecordingButton, &QPushButton::toggled, this, &RecordPage::onStartRecordingButtonClicked);
connect(ui->workingDirectory, &KUrlRequester::textChanged, this, &RecordPage::onWorkingDirectoryNameChanged);
connect(ui->viewPerfRecordResultsButton, &QPushButton::clicked, this,
Expand Down

0 comments on commit f4a310c

Please sign in to comment.