diff --git a/src/common/utility.h b/src/common/utility.h index c312855ad..9b340c315 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_MAJOR < 5 || (QT_VERSION_MAJOR == 5 && QT_VERSION_MINOR < 9 )) #endif /** diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index cb77e5f74..23670c0a1 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -35,7 +35,10 @@ #include #include #include + +#if !(QTLEGACY) #include +#endif namespace OCC { @@ -82,9 +85,9 @@ GeneralSettings::GeneralSettings(QWidget *parent) // The condition should match the default value of ConfigFile::showInExplorerNavigationPane. #ifdef Q_OS_WIN #if QTLEGACY - if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows10) - #else if (QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS10) + #else + if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows10) #endif _ui->showInExplorerNavigationPaneCheckBox->setVisible(false); #endif diff --git a/src/gui/openfilemanager.cpp b/src/gui/openfilemanager.cpp index 135dfee09..20673fc7a 100644 --- a/src/gui/openfilemanager.cpp +++ b/src/gui/openfilemanager.cpp @@ -21,7 +21,10 @@ #include #include #include + +#if !(QTLEGACY) #include +#endif namespace OCC { @@ -91,9 +94,9 @@ void showInFileManager(const QString &localPath) if (Utility::isWindows()) { #ifdef Q_OS_WIN #if QTLEGACY - if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows7) - #else if (QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS10) + #else + if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows7) #endif return; #endif diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 20b61c27b..f5895aca9 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -36,7 +36,10 @@ #include #include #include + +#if !(QTLEGACY) #include +#endif #define DEFAULT_REMOTE_POLL_INTERVAL 5000 // default remote poll time in milliseconds #define DEFAULT_MAX_LOG_LINES 20000 @@ -176,9 +179,9 @@ bool ConfigFile::showInExplorerNavigationPane() const const bool defaultValue = #ifdef Q_OS_WIN #if QTLEGACY - QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10; - #else (QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS10); + #else + QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10; #endif #else false