mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 05:45:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Moved macro definition due to timing issues while compiling when relying on header inheritance

Browse source 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
This commit is contained in:
Dominique Fuchs 2019-09-08 19:46:08 +02:00
parent c779098772
commit c585e81530
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/utility.h
View file

@ -60,7 +60,6 @@ namespace Utility {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
OCSYNC_EXPORT DWORD convertSizeToDWORD(size_t &convertVar); OCSYNC_EXPORT DWORD convertSizeToDWORD(size_t &convertVar);
#define QTLEGACY (QT_VERSION < QT_VERSION_CHECK(5,9,0))
#endif #endif
/** /**

2
src/gui/generalsettings.cpp
View file

@ -36,6 +36,8 @@
#include <QDir> #include <QDir>
#include <QScopedValueRollback> #include <QScopedValueRollback>
#define QTLEGACY (QT_VERSION < QT_VERSION_CHECK(5,9,0))
#if !(QTLEGACY) #if !(QTLEGACY)
#include <QOperatingSystemVersion> #include <QOperatingSystemVersion>
#endif #endif

2
src/gui/openfilemanager.cpp
View file

@ -22,6 +22,8 @@
#include <QDesktopServices> #include <QDesktopServices>
#include <QApplication> #include <QApplication>
#define QTLEGACY (QT_VERSION < QT_VERSION_CHECK(5,9,0))
#if !(QTLEGACY) #if !(QTLEGACY)
#include <QOperatingSystemVersion> #include <QOperatingSystemVersion>
#endif #endif

2
src/libsync/configfile.cpp
View file

@ -37,6 +37,8 @@
#include <QNetworkProxy> #include <QNetworkProxy>
#include <QStandardPaths> #include <QStandardPaths>
#define QTLEGACY (QT_VERSION < QT_VERSION_CHECK(5,9,0))
#if !(QTLEGACY) #if !(QTLEGACY)
#include <QOperatingSystemVersion> #include <QOperatingSystemVersion>
#endif #endif