Prechádzať zdrojové kódy

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 <[email protected]>
Acked-by: Ben Boeckel <[email protected]>
Merge-request: !4978
Brad King 5 rokov pred
rodič
commit
dab33d1e33
1 zmenil súbory, kde vykonal 4 pridanie a 4 odobranie
  1. 4 4
      Source/QtDialog/QCMakeCacheView.cxx

+ 4 - 4
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
   }