diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2021-01-11 19:46:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-01-11 20:00:51 (GMT) |
| commit | 9f48a468cd68d69e16302174ff202e9e51035023 (patch) | |
| tree | 2fe4a4c3ba4b9eb2d6996014536faebd2036e458 /Source/QtDialog/EnvironmentDialog.cxx | |
| parent | e20560a2dc9668bb9fd55bea79ef7508ab72c746 (diff) | |
| parent | 06dfa5a7b6c0174bfcb4691a9aaf00809bd7271d (diff) | |
| download | CMake-9f48a468cd68d69e16302174ff202e9e51035023.zip CMake-9f48a468cd68d69e16302174ff202e9e51035023.tar.gz CMake-9f48a468cd68d69e16302174ff202e9e51035023.tar.bz2 | |
Merge branch 'master' into cmake-gui-qrc-fix
Diffstat (limited to 'Source/QtDialog/EnvironmentDialog.cxx')
| -rw-r--r-- | Source/QtDialog/EnvironmentDialog.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/QtDialog/EnvironmentDialog.cxx b/Source/QtDialog/EnvironmentDialog.cxx index 846456c..d4f978c 100644 --- a/Source/QtDialog/EnvironmentDialog.cxx +++ b/Source/QtDialog/EnvironmentDialog.cxx @@ -81,7 +81,11 @@ 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)) + return key.contains(this->filterRegularExpression()); +#else return key.contains(this->filterRegExp()); +#endif } EnvironmentDialog::EnvironmentDialog(const QProcessEnvironment& environment, |