diff --git a/plugins/manual/manual.cpp b/plugins/manual/manual.cpp index e9b1f635b..665e93cf8 100644 --- a/plugins/manual/manual.cpp +++ b/plugins/manual/manual.cpp @@ -32,7 +32,7 @@ #include #include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= 0x050000 # if defined(Q_OS_WIN) # include # endif @@ -80,7 +80,7 @@ static struct { #ifdef Q_OS_WIN static QWidget *QWidgetForHWND(HWND hwnd) { -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= 0x050000 QList windows = qApp->topLevelWidgets(); foreach (QWidget *w, windows) { QWindow *window = w->windowHandle(); @@ -275,7 +275,7 @@ static void config(HWND h) { #else mDlg->setParent(reinterpret_cast(h), Qt::Dialog); #endif -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION < 0x050000 mDlg->qpbUnhinge->setEnabled(true); #endif } else { @@ -286,7 +286,7 @@ static void config(HWND h) { #endif } -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= 0x050000 mDlg->qpbUnhinge->setEnabled(false); #endif mDlg->show(); @@ -325,7 +325,7 @@ static std::wstring shortname(L"Manual placement"); static void about(HWND h) { QMessageBox::about( -#if defined(Q_OS_WIN) && QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000 QWidgetForHWND(h), #else reinterpret_cast(h), diff --git a/plugins/manual/manual.h b/plugins/manual/manual.h index d67791be2..7b8b8fe7c 100644 --- a/plugins/manual/manual.h +++ b/plugins/manual/manual.h @@ -2,7 +2,7 @@ #define MUMBLE_MANUAL_H_ #include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= 0x050000 # include # include # include diff --git a/src/mumble/MainWindow.h b/src/mumble/MainWindow.h index 116cafef8..fb64ea670 100644 --- a/src/mumble/MainWindow.h +++ b/src/mumble/MainWindow.h @@ -33,7 +33,7 @@ #define MUMBLE_MUMBLE_MAINWINDOW_H_ #include -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= 0x050000 # include # include # include @@ -116,7 +116,7 @@ class MainWindow : public QMainWindow, public MessageHandler, public Ui::MainWin bool bSuppressAskOnQuit; bool bAutoUnmute; -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= 0x050000 QPointer cContextChannel; QPointer cuContextUser; #else diff --git a/src/mumble/MumbleApplication.cpp b/src/mumble/MumbleApplication.cpp index eec8db579..3af161273 100644 --- a/src/mumble/MumbleApplication.cpp +++ b/src/mumble/MumbleApplication.cpp @@ -68,7 +68,7 @@ bool MumbleApplication::event(QEvent *e) { } #ifdef Q_OS_WIN -# if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +# if QT_VERSION >= 0x050000 bool MumbleApplication::nativeEventFilter(const QByteArray &eventType, void *message, long *result) { Q_UNUSED(eventType); MSG *msg = reinterpret_cast(message);