Commit 8362915b authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'cmake-gui-restore-search' into release-3.20

134d6912

 cmake-gui: Restore search bar for cache view and environment dialog
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !5845
parents e1ea0c95 134d6912
Pipeline #215658 canceled with stages
in 1 minute and 38 seconds
......@@ -110,8 +110,14 @@ 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))
QObject::connect(this->Search, &QLineEdit::textChanged, this->m_filter,
QOverload<const QString&>::of(
&EnvironmentSearchFilter::setFilterRegularExpression));
#else
QObject::connect(this->Search, &QLineEdit::textChanged, this->m_filter,
&EnvironmentSearchFilter::setFilterFixedString);
#endif
QObject::connect(this->Environment->selectionModel(),
&QItemSelectionModel::selectionChanged, this,
&EnvironmentDialog::selectionChanged);
......
......@@ -170,7 +170,11 @@ bool QCMakeCacheView::showAdvanced() const
void QCMakeCacheView::setSearchFilter(const QString& s)
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
this->SearchFilter->setFilterRegularExpression(s);
#else
this->SearchFilter->setFilterFixedString(s);
#endif
}
QCMakeCacheModel::QCMakeCacheModel(QObject* p)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment