diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-15 11:12:49 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-15 11:12:49 (GMT) |
| commit | 736fb342945051fb7459b5a28d37f4085b8ba876 (patch) | |
| tree | 2ad64838fed8d009b84cc99588a3c9956e892fda /Source/QtDialog | |
| parent | 6dc7c1f85d7a01917f7f239866f88ebc3268df89 (diff) | |
| download | CMake-736fb342945051fb7459b5a28d37f4085b8ba876.zip CMake-736fb342945051fb7459b5a28d37f4085b8ba876.tar.gz CMake-736fb342945051fb7459b5a28d37f4085b8ba876.tar.bz2 | |
QCMake: use loadRelaxed if available
Added in 5.14 and load() was deprecated at the same time.
Diffstat (limited to 'Source/QtDialog')
| -rw-r--r-- | Source/QtDialog/QCMake.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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) |