diff options
author | Liang Qi <liang.qi@qt.io> | 2018-11-12 09:40:47 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-15 17:20:15 +0000 |
commit | 527406cbd99f44470ef87468b73c18df949e8ac7 (patch) | |
tree | 4ee73cffee4bf8699ce45d902aa9b30c6ebb1cc4 /src/platformsupport/themes/genericunix | |
parent | cd201b2c2c2849fea0c5a38ffd979cd9d5b24997 (diff) |
Modernize the "settings" feature
Change-Id: I9b8a61ecb1413b513ae5c9e77d3ee1b3e8b6562c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/platformsupport/themes/genericunix')
-rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | 10 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes_p.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp index 43d49cbbc8..1003812767 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp @@ -53,7 +53,9 @@ #include <QtCore/QMimeDatabase> #endif #include <QtCore/QLoggingCategory> +#if QT_CONFIG(settings) #include <QtCore/QSettings> +#endif #include <QtCore/QVariant> #include <QtCore/QStandardPaths> #include <QtCore/QStringList> @@ -261,7 +263,7 @@ static QIcon xdgFileIcon(const QFileInfo &fileInfo) } #endif -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) class QKdeThemePrivate : public QPlatformThemePrivate { public: @@ -688,7 +690,7 @@ QPlatformSystemTrayIcon *QKdeTheme::createPlatformSystemTrayIcon() const } #endif -#endif // QT_NO_SETTINGS +#endif // settings /*! \class QGnomeTheme @@ -834,7 +836,7 @@ QPlatformTheme *QGenericUnixTheme::createUnixTheme(const QString &name) { if (name == QLatin1String(QGenericUnixTheme::name)) return new QGenericUnixTheme; -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) if (name == QLatin1String(QKdeTheme::name)) if (QPlatformTheme *kdeTheme = QKdeTheme::createKdeTheme()) return kdeTheme; @@ -859,7 +861,7 @@ QStringList QGenericUnixTheme::themeNames() const QList<QByteArray> desktopNames = desktopEnvironment.split(':'); for (const QByteArray &desktopName : desktopNames) { if (desktopEnvironment == "KDE") { -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) result.push_back(QLatin1String(QKdeTheme::name)); #endif } else if (gtkBasedEnvironments.contains(desktopName)) { diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h index 865a624694..a5963b79ea 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h @@ -96,7 +96,7 @@ public: static const char *name; }; -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) class QKdeThemePrivate; class QKdeTheme : public QPlatformTheme @@ -123,7 +123,7 @@ public: static const char *name; }; -#endif // QT_NO_SETTINGS +#endif // settings class QGnomeThemePrivate; |