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/gui/image/qiconloader.cpp | |
| 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/gui/image/qiconloader.cpp')
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 1ea4f1340b..3695408597 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -50,7 +50,9 @@ #include <QtCore/qmath.h> #include <QtCore/QList> #include <QtCore/QDir> +#if QT_CONFIG(settings) #include <QtCore/QSettings> +#endif #include <QtGui/QPainter> #include <private/qhexstring_p.h> @@ -338,7 +340,7 @@ QIconTheme::QIconTheme(const QString &themeName) m_valid = true; } } -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) if (themeIndex.exists()) { const QSettings indexReader(themeIndex.fileName(), QSettings::IniFormat); const QStringList keys = indexReader.allKeys(); @@ -397,7 +399,7 @@ QIconTheme::QIconTheme(const QString &themeName) if (!m_parents.contains(QLatin1String("hicolor"))) m_parents.append(QLatin1String("hicolor")); } -#endif //QT_NO_SETTINGS +#endif // settings } QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName, |