Fixed logic error in QTLEGACY macro and added forgottin #if clause for header file

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>

diff --git a/src/common/utility.h b/src/common/utility.h
index c312855ad8ed34808f1fe99a6ada592a9640ba2d..9b340c315b07a52456907ed024e96a5c6de4a42e 100644 (file)
--- 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 cb77e5f74d14b1a2475775efad59d3fbc9a628fb..23670c0a19cba409d4e561e384cdb890bce7a2f4 100644 (file)
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -35,7 +35,10 @@
 #include <QNetworkProxy>
 #include <QDir>
 #include <QScopedValueRollback>
+
+#if !(QTLEGACY)
 #include <QOperatingSystemVersion>
+#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 135dfee097605c063d37c21977db3b1a80559d6b..20673fc7ae614106a63ef52181a84c50eba9b909 100644 (file)
--- a/src/gui/openfilemanager.cpp
+++ b/src/gui/openfilemanager.cpp
@@ -21,7 +21,10 @@
 #include <QUrl>
 #include <QDesktopServices>
 #include <QApplication>
+
+#if !(QTLEGACY)
 #include <QOperatingSystemVersion>
+#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 20b61c27b3af0789a9fbb5c09d8dd1f725c5bed9..f5895aca98b150ef6a4e6ac934d863c653755dd2 100644 (file)
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -36,7 +36,10 @@
 #include <QSettings>
 #include <QNetworkProxy>
 #include <QStandardPaths>
+
+#if !(QTLEGACY)
 #include <QOperatingSystemVersion>
+#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