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/generalsettings.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/generalsettings.cpp')
| -rw-r--r-- | src/gui/generalsettings.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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 <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 |