mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cmake-gui-qt-5.14'

Browse Source 
af6cf586f6 cmake-gui: Fix crash when built with Qt 5.14 or later

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5045
This commit is contained in:
Brad King
2020-07-23 12:20:40 +00:00
committed by Kitware Robot
parent 2f53f8684f af6cf586f6
commit f3d93edb36
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/QtDialog/QCMakeCacheView.cxx
+3 -2
View File
@@ -220,8 +220,9 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
QSet<QCMakeProperty> oldProps = this->properties().toSet();
#else
QSet<QCMakeProperty> oldProps = QSet<QCMakeProperty>(
this->properties().begin(), this->properties().end());
QCMakePropertyList const& oldPropsList = this->properties();
QSet<QCMakeProperty> oldProps =
QSet<QCMakeProperty>(oldPropsList.begin(), oldPropsList.end());
#endif
oldProps.intersect(newProps);
newProps.subtract(oldProps);