diff options
author | Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> | 2019-09-08 19:42:40 +0300 |
---|---|---|
committer | Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> | 2019-09-08 19:42:40 +0300 |
commit | 48097801e8d65cb3001d1ed2963feeb2e5aaef28 (patch) | |
tree | 9c31755edb3d2761ae725e65a0eab4937c1bfc76 /src/gui/openfilemanager.cpp | |
parent | dca83aad456b99ed1f0690c1ecdc250fcd6f6302 (diff) |
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>
Diffstat (limited to 'src/gui/openfilemanager.cpp')
-rw-r--r-- | src/gui/openfilemanager.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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 <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 |