diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-02-23 11:35:53 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-08-21 11:36:51 (GMT) |
| commit | 717f31a877e701b801043b893c97f4a186f93739 (patch) | |
| tree | 55048ea279020f7beddf271d9acb10a8cffac6c9 /Source/QtDialog | |
| parent | 066e85893ffa3492e4247e59a80ee1de67babef5 (diff) | |
| download | CMake-717f31a877e701b801043b893c97f4a186f93739.zip CMake-717f31a877e701b801043b893c97f4a186f93739.tar.gz CMake-717f31a877e701b801043b893c97f4a186f93739.tar.bz2 | |
Compile with both Qt4 and Qt5.
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 a2b1567..0d01181 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -348,7 +348,11 @@ void QCMake::interrupt() bool QCMake::interruptCallback(void* cd) { QCMake* self = reinterpret_cast<QCMake*>(cd); +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) return self->InterruptFlag; +#else + return self->InterruptFlag.load(); +#endif } void QCMake::progressCallback(const char* msg, float percent, void* cd) |