diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-05-29 10:21:13 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-09 11:18:17 +0200 |
| commit | d04e06dc3279bd812d5a060c3f045b84ea345f35 (patch) | |
| tree | a6022b61cfe388c31b7a3d654aeb80137b3ffb48 /src/platformsupport/themes/genericunix | |
| parent | 5b0273fc7a27785b6079a3b39681c3db22926742 (diff) | |
Remove Library dependency on Settings
made QLibraryInfo available with QT_NO_SETTINGS.
QKdeTheme is removed when QT_NO_SETTINGS is defined.
Change-Id: I63d619bb305e6c23985d9ea50c72d39a697b7a4b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/platformsupport/themes/genericunix')
| -rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | 8 | ||||
| -rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes_p.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp index d4826fb542..970b57de63 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp @@ -124,6 +124,8 @@ QVariant QGenericUnixTheme::themeHint(ThemeHint hint) const return QPlatformTheme::themeHint(hint); } +#ifndef QT_NO_SETTINGS + // Reads the color from the KDE configuration, and store it in the // palette with the given color role if found. static inline bool kdeColor(QPalette *pal, QPalette::ColorRole role, @@ -326,6 +328,8 @@ QPlatformTheme *QKdeTheme::createKdeTheme() return 0; } +#endif // QT_NO_SETTINGS + /*! \class QGnomeTheme \brief QGnomeTheme is a theme implementation for the Gnome desktop. @@ -369,9 +373,11 @@ QPlatformTheme *QGenericUnixTheme::createUnixTheme(const QString &name) { if (name == QLatin1String(QGenericUnixTheme::name)) return new QGenericUnixTheme; +#ifndef QT_NO_SETTINGS if (name == QLatin1String(QKdeTheme::name)) if (QPlatformTheme *kdeTheme = QKdeTheme::createKdeTheme()) return kdeTheme; +#endif if (name == QLatin1String(QGnomeTheme::name)) return new QGnomeTheme; return new QGenericUnixTheme; @@ -382,7 +388,9 @@ QStringList QGenericUnixTheme::themeNames() QStringList result; if (QGuiApplication::desktopSettingsAware()) { if (QGuiApplicationPrivate::platformIntegration()->services()->desktopEnvironment() == QByteArray("KDE")) { +#ifndef QT_NO_SETTINGS result.push_back(QLatin1String(QKdeTheme::name)); +#endif } else if (QGuiApplicationPrivate::platformIntegration()->services()->desktopEnvironment() == QByteArray("GNOME")) { result.push_back(QLatin1String(QGnomeTheme::name)); } diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h index a1b50865ed..64b2db0a10 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h @@ -77,6 +77,7 @@ public: static const char *name; }; +#ifndef QT_NO_SETTINGS class QKdeTheme : public QPlatformTheme { QKdeTheme(const QString &kdeHome, int kdeVersion); @@ -107,6 +108,7 @@ private: int m_toolButtonStyle; int m_toolBarIconSize; }; +#endif // QT_NO_SETTINGS class QGnomeTheme : public QPlatformTheme { |