diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-05 13:25:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-05 13:25:29 (GMT) |
| commit | 412479b9d8476b1c9d696fc38db6977404e0ad05 (patch) | |
| tree | 6529c8fcaacd693ee5244ec12952ee7175bc43e5 | |
| parent | 12a139f2b6610e688be3d2bd317d46f0ce6ddf1f (diff) | |
| parent | 9ec50ff157f064ba07c9e1229f84a8cd16fff87d (diff) | |
| download | CMake-412479b9d8476b1c9d696fc38db6977404e0ad05.zip CMake-412479b9d8476b1c9d696fc38db6977404e0ad05.tar.gz CMake-412479b9d8476b1c9d696fc38db6977404e0ad05.tar.bz2 | |
Merge topic 'cmake-gui-search-case' into release-3.20
9ec50ff157 cmake-gui: Restore search bar case insensitivity
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5878
| -rw-r--r-- | Source/QtDialog/EnvironmentDialog.cxx | 4 | ||||
| -rw-r--r-- | Source/QtDialog/QCMakeCacheView.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/QtDialog/EnvironmentDialog.cxx b/Source/QtDialog/EnvironmentDialog.cxx index 9c8e892..bf89816 100644 --- a/Source/QtDialog/EnvironmentDialog.cxx +++ b/Source/QtDialog/EnvironmentDialog.cxx @@ -81,7 +81,7 @@ bool EnvironmentSearchFilter::filterAcceptsRow(int row, auto* model = this->sourceModel(); auto key = model->data(model->index(row, 0, parent), Qt::DisplayRole).toString(); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) return key.contains(this->filterRegularExpression()); #else return key.contains(this->filterRegExp()); @@ -110,7 +110,7 @@ EnvironmentDialog::EnvironmentDialog(const QProcessEnvironment& environment, &EnvironmentDialog::addEntry); QObject::connect(this->RemoveEntry, &QAbstractButton::clicked, this, &EnvironmentDialog::removeSelectedEntries); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) QObject::connect(this->Search, &QLineEdit::textChanged, this->m_filter, QOverload<const QString&>::of( &EnvironmentSearchFilter::setFilterRegularExpression)); diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx index 536b92d..994df78 100644 --- a/Source/QtDialog/QCMakeCacheView.cxx +++ b/Source/QtDialog/QCMakeCacheView.cxx @@ -47,7 +47,7 @@ protected: // check all strings for a match foreach (QString const& str, strs) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) if (str.contains(this->filterRegularExpression())) { #else if (str.contains(this->filterRegExp())) { @@ -170,7 +170,7 @@ bool QCMakeCacheView::showAdvanced() const void QCMakeCacheView::setSearchFilter(const QString& s) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) this->SearchFilter->setFilterRegularExpression(s); #else this->SearchFilter->setFilterFixedString(s); |