From 736fb342945051fb7459b5a28d37f4085b8ba876 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 15 Jun 2020 07:12:49 -0400 Subject: QCMake: use loadRelaxed if available Added in 5.14 and load() was deprecated at the same time. --- Source/QtDialog/QCMake.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index a631404..f0b967b 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -340,7 +340,11 @@ void QCMake::interrupt() bool QCMake::interruptCallback() { +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) return this->InterruptFlag.load(); +#else + return this->InterruptFlag.loadRelaxed(); +#endif } void QCMake::progressCallback(const std::string& msg, float percent) -- cgit v0.12