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/gui/image/qicon.cpp | |
| 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/gui/image/qicon.cpp')
| -rw-r--r-- | src/gui/image/qicon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 9cfc8476aa..3916672c85 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -826,7 +826,7 @@ void QIcon::addFile(const QString &fileName, const QSize &size, Mode mode, State if (fileName.isEmpty()) return; if (!d) { -#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY QFileInfo info(fileName); QString suffix = info.suffix(); if (!suffix.isEmpty()) { @@ -1085,7 +1085,7 @@ QDataStream &operator>>(QDataStream &s, QIcon &icon) QIconEngine *engine = new QIconLoaderEngine(); icon.d->engine = engine; engine->read(s); -#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY } else { const int index = loader()->indexOf(key); if (index != -1) { |