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/qpictureformatplugin.h | |
| 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/qpictureformatplugin.h')
| -rw-r--r-- | src/gui/image/qpictureformatplugin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qpictureformatplugin.h b/src/gui/image/qpictureformatplugin.h index 5f8477b117..003ccac116 100644 --- a/src/gui/image/qpictureformatplugin.h +++ b/src/gui/image/qpictureformatplugin.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_PICTURE) +#if !defined(QT_NO_PICTURE) class QPicture; class QImage; @@ -68,7 +68,7 @@ public: }; -#endif // QT_NO_LIBRARY || QT_NO_PICTURE +#endif // QT_NO_PICTURE QT_END_NAMESPACE |