mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-09 18:09:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cmake-gui-qt-5.14' into release-3.18

Browse Source 
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
This commit is contained in:
Brad King
2020-07-07 13:17:08 +00:00
committed by Kitware Robot
parent 996b312825 8eb7cf9b5f
commit dab33d1e33
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/QtDialog/QCMakeCacheView.cxx
View File

@@ -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
}