kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile with both Qt4 and Qt5.

This commit is contained in:
Stephen Kelly 2012-02-23 12:35:53 +01:00
parent 066e85893f
commit 717f31a877
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/QtDialog/QCMake.cxx
View File

@ -348,7 +348,11 @@ void QCMake::interrupt()
bool QCMake::interruptCallback(void* cd) bool QCMake::interruptCallback(void* cd)
{ {
QCMake* self = reinterpret_cast<QCMake*>(cd); QCMake* self = reinterpret_cast<QCMake*>(cd);
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
return self->InterruptFlag; return self->InterruptFlag;
#else
return self->InterruptFlag.load();
#endif
} }
void QCMake::progressCallback(const char* msg, float percent, void* cd) void QCMake::progressCallback(const char* msg, float percent, void* cd)