Jelajahi Sumber

QCMake: use loadRelaxed if available

Added in 5.14 and load() was deprecated at the same time.
Ben Boeckel 5 tahun lalu
induk
melakukan
736fb34294
1 mengubah file dengan 4 tambahan dan 0 penghapusan
  1. 4 0
      Source/QtDialog/QCMake.cxx

+ 4 - 0
Source/QtDialog/QCMake.cxx

@@ -340,7 +340,11 @@ void QCMake::interrupt()
 
 
 bool QCMake::interruptCallback()
 bool QCMake::interruptCallback()
 {
 {
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
   return this->InterruptFlag.load();
   return this->InterruptFlag.load();
+#else
+  return this->InterruptFlag.loadRelaxed();
+#endif
 }
 }
 
 
 void QCMake::progressCallback(const std::string& msg, float percent)
 void QCMake::progressCallback(const std::string& msg, float percent)