mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-25 05:45:42 +03:00
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>
This commit is contained in:
parent
dca83aad45
commit
48097801e8
4 changed files with 16 additions and 7 deletions
|
@ -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
|
||||
|
||||
/**
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue