From 222b2d86459fde1310399a770ebf6317418ea98b Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Sun, 8 Sep 2019 19:17:00 +0200 Subject: [PATCH] Further testing of cond. include of Qt library > 5.9. Utilized different macro. Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/common/utility.h | 2 +- src/gui/generalsettings.cpp | 2 +- src/gui/openfilemanager.cpp | 2 +- src/libsync/configfile.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/utility.h b/src/common/utility.h index 9da34a7ec..3af19ad7f 100644 --- a/src/common/utility.h +++ b/src/common/utility.h @@ -60,7 +60,7 @@ namespace Utility { #ifdef Q_OS_WIN OCSYNC_EXPORT DWORD convertSizeToDWORD(size_t &convertVar); - #define QTLEGACY (QT_VERSION_MAJOR < 5 | (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR < 9 )) + #define QTLEGACY (QT_VERSION < QT_VERSION_CHECK(5,9,0)) #endif /** diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index 23670c0a1..214eae4e2 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -36,7 +36,7 @@ #include #include -#if !(QTLEGACY) +#if (QT_VERSION >= QT_VERSION_CHECK(5,9,0)) #include #endif diff --git a/src/gui/openfilemanager.cpp b/src/gui/openfilemanager.cpp index 20673fc7a..e32058f55 100644 --- a/src/gui/openfilemanager.cpp +++ b/src/gui/openfilemanager.cpp @@ -22,7 +22,7 @@ #include #include -#if !(QTLEGACY) +#if (QT_VERSION >= QT_VERSION_CHECK(5,9,0)) #include #endif diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index f5895aca9..3f2fa6fd4 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -37,7 +37,7 @@ #include #include -#if !(QTLEGACY) +#if (QT_VERSION >= QT_VERSION_CHECK(5,9,0)) #include #endif -- 2.30.2