diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-07 13:17:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-07 13:17:23 (GMT) |
| commit | 6bdbc7dba0182059c5454f21fe3f0c88c9782a61 (patch) | |
| tree | 2b8ebcac9d69bcba55e59b1b2472aeb05575563a /Source/QtDialog | |
| parent | 8efbe9f4fe7b39a40c571cf3c8849b87484156c3 (diff) | |
| parent | 8eb7cf9b5ff28d336fc06ca989ab1d0f9eb9cecb (diff) | |
| download | CMake-6bdbc7dba0182059c5454f21fe3f0c88c9782a61.zip CMake-6bdbc7dba0182059c5454f21fe3f0c88c9782a61.tar.gz CMake-6bdbc7dba0182059c5454f21fe3f0c88c9782a61.tar.bz2 | |
Merge topic 'cmake-gui-qt-5.14'
8eb7cf9b5f cmake-gui: Fix compilation as C++14 with Qt 5.14
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4978
Diffstat (limited to 'Source/QtDialog')
| -rw-r--r-- | Source/QtDialog/QCMakeCacheView.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx index 928494b..659a512 100644 --- a/Source/QtDialog/QCMakeCacheView.cxx +++ b/Source/QtDialog/QCMakeCacheView.cxx @@ -214,14 +214,14 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props) #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) newProps = props.toSet(); #else - newProps = QSet(props.begin(), props.end()); + newProps = QSet<QCMakeProperty>(props.begin(), props.end()); #endif newProps2 = newProps; #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) QSet<QCMakeProperty> oldProps = this->properties().toSet(); #else - QSet<QCMakeProperty> oldProps = - QSet(this->properties().begin(), this->properties().end()); + QSet<QCMakeProperty> oldProps = QSet<QCMakeProperty>( + this->properties().begin(), this->properties().end()); #endif oldProps.intersect(newProps); newProps.subtract(oldProps); @@ -230,7 +230,7 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props) #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) newProps2 = props.toSet(); #else - newProps2 = QSet(props.begin(), props.end()); + newProps2 = QSet<QCMakeProperty>(props.begin(), props.end()); #endif } |