diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-06 12:18:40 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-02-08 10:40:33 +0000 |
| commit | 4fb7eb0da74798205f5cac693c921065492fa33e (patch) | |
| tree | 2082182e4b640ef9233d1bd9108caccd30a5edb7 /src/gui/image/qiconloader.cpp | |
| parent | 21861e6fd1fcd1e4642f3d4c06ee7181d2c81778 (diff) | |
Drop most "#ifndef QT_NO_LIBRARY"
As we can load plugins without QLibrary now, we don't have to #ifdef
out the code that does so anymore.
Change-Id: I1dc20216830a882dbd5a1b431183407e6b19c837
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/image/qiconloader.cpp')
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index be032e498b..8cc1dfa7d0 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -94,9 +94,7 @@ static inline QStringList systemIconSearchPaths() return QStringList(); } -#ifndef QT_NO_LIBRARY extern QFactoryLoader *qt_iconEngineFactoryLoader(); // qicon.cpp -#endif void QIconLoader::ensureInitialized() { @@ -109,10 +107,8 @@ void QIconLoader::ensureInitialized() if (m_systemTheme.isEmpty()) m_systemTheme = fallbackTheme(); -#ifndef QT_NO_LIBRARY if (qt_iconEngineFactoryLoader()->keyMap().key(QLatin1String("svg"), -1) != -1) m_supportsSvg = true; -#endif //QT_NO_LIBRARY } } |