commit 4b1c6f908ff392a74ccea16d55e562224896306d
author Brad King <brad.king@kitware.com> Thu Jul 23 12:20:40 2020 +0000
committer Kitware Robot <kwrobot@kitware.com> Thu Jul 23 08:20:48 2020 -0400
tree 8a8b8629c6c99cdb4ba07a5e13d777e089ac0e3e
parent 24571e8eca27d6c51ca408f4b834fa930760e1d0
parent af6cf586f63654f1c9d4e78b3acfafa2cfecae57

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

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

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5045

Source/QtDialog/QCMakeCacheView.cxx

diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index b1f4a82..9b24fbd 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -226,8 +226,9 @@
 #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);