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/widgets | |
| 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/widgets')
| -rw-r--r-- | src/widgets/styles/qstylefactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/styles/qstylefactory.cpp b/src/widgets/styles/qstylefactory.cpp index 479cc1aab9..450ad20bca 100644 --- a/src/widgets/styles/qstylefactory.cpp +++ b/src/widgets/styles/qstylefactory.cpp @@ -180,7 +180,7 @@ QStyle *QStyleFactory::create(const QString& key) } else #endif { } // Keep these here - they make the #ifdefery above work -#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY if (!ret) ret = qLoadPlugin<QStyle, QStylePlugin>(loader(), style); #endif @@ -198,7 +198,7 @@ QStyle *QStyleFactory::create(const QString& key) QStringList QStyleFactory::keys() { QStringList list; -#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY typedef QMultiMap<int, QString> PluginKeyMap; typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator; |