mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmake-gui: Restore search bar case insensitivity

Browse Source 
Since these changes:

* commit f1de6f6682 (cmake-gui: Support building against Qt6,
                     2020-12-17, v3.20.0-rc1~205^2~7)
* commit 134d69121e (cmake-gui: Restore search bar for cache view and
                     environment dialog, 2021-02-22, v3.20.0-rc2~12^2)

the search bar is no longer case insensitive when using Qt 5.12.[0-1],
and possibly some later versions.  It works as of Qt 5.15 though, so
update our version check accordingly.

Fixes: #21884
This commit is contained in:
Brad King
2021-03-04 11:25:54 -05:00
parent 12a139f2b6
commit 9ec50ff157
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/QtDialog/EnvironmentDialog.cxx
View File

@@ -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));

4
Source/QtDialog/QCMakeCacheView.cxx
View File

@@ -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);