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/qpicture.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/qpicture.cpp')
| -rw-r--r-- | src/gui/image/qpicture.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 21bdfeff34..7506e2e1a9 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -1414,7 +1414,6 @@ Q_GLOBAL_STATIC(QPHList, pictureHandlers) void qt_init_picture_plugins() { -#ifndef QT_NO_LIBRARY typedef QMultiMap<int, QString> PluginKeyMap; typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator; @@ -1429,7 +1428,6 @@ void qt_init_picture_plugins() if (QPictureFormatPlugin *format = qobject_cast<QPictureFormatPlugin*>(loader.instance(it.key()))) format->installIOHandler(it.value()); } -#endif } static void cleanup() |