diff options
author | Liang Qi <liang.qi@qt.io> | 2018-11-19 12:42:10 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-19 12:42:10 +0100 |
commit | 4d180586cddbd71a67c83246db3bec1caa595e05 (patch) | |
tree | 0970def686b4e28e9cf6a3f0fc897e05bb0a9fbc /src/platformsupport/services/genericunix/qgenericunixservices.cpp | |
parent | 6b088b7a1da37511a8abb1503e4f2f95632dbdac (diff) | |
parent | 527406cbd99f44470ef87468b73c18df949e8ac7 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
Change-Id: I66a08c770767a93cd26535689e3e7806486aab06
Diffstat (limited to 'src/platformsupport/services/genericunix/qgenericunixservices.cpp')
-rw-r--r-- | src/platformsupport/services/genericunix/qgenericunixservices.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices.cpp b/src/platformsupport/services/genericunix/qgenericunixservices.cpp index 67884cef92..7fff50b2a1 100644 --- a/src/platformsupport/services/genericunix/qgenericunixservices.cpp +++ b/src/platformsupport/services/genericunix/qgenericunixservices.cpp @@ -45,7 +45,9 @@ #if QT_CONFIG(process) # include <QtCore/QProcess> #endif +#if QT_CONFIG(settings) #include <QtCore/QSettings> +#endif #include <QtCore/QStandardPaths> #include <QtCore/QUrl> @@ -93,7 +95,7 @@ static inline QByteArray detectDesktopEnvironment() // This can be a path in /usr/share/xsessions int slash = desktopSession.lastIndexOf('/'); if (slash != -1) { -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) QSettings desktopFile(QFile::decodeName(desktopSession + ".desktop"), QSettings::IniFormat); desktopFile.beginGroup(QStringLiteral("Desktop Entry")); QByteArray desktopName = desktopFile.value(QStringLiteral("DesktopNames")).toByteArray(); |