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:22 (GMT) |
| commit | dab33d1e3339c0f06437692db0c3e1db49765ba2 (patch) | |
| tree | 02a16a44ba232d0c02d8783b0238671e0e525836 | |
| parent | 996b312825524b7e4595742b4892ba2a99e9536f (diff) | |
| parent | 8eb7cf9b5ff28d336fc06ca989ab1d0f9eb9cecb (diff) | |
| download | CMake-dab33d1e3339c0f06437692db0c3e1db49765ba2.zip CMake-dab33d1e3339c0f06437692db0c3e1db49765ba2.tar.gz CMake-dab33d1e3339c0f06437692db0c3e1db49765ba2.tar.bz2 | |
Merge topic 'cmake-gui-qt-5.14' into release-3.18
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
| -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 541d3e9..b1f4a82 100644 --- a/Source/QtDialog/QCMakeCacheView.cxx +++ b/Source/QtDialog/QCMakeCacheView.cxx @@ -220,14 +220,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); @@ -236,7 +236,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 } |