diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-09 03:00:28 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-09 03:00:28 +0200 |
| commit | 86872a1846ce622bb5f305a75a20939ac145122f (patch) | |
| tree | fbfc26468ed9e1780d3e6bc4605de8ae6defd97d /src/plugins/imageformats/webp/main.cpp | |
| parent | cee7701c76579ff139b42f2092306a88f0394dc5 (diff) | |
| parent | b1d12f8c874cf36d1672e9fe7203aa7d499c39c5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Change-Id: I02bc865209f0092c68e5be1542f54e605c517c58
Diffstat (limited to 'src/plugins/imageformats/webp/main.cpp')
| -rw-r--r-- | src/plugins/imageformats/webp/main.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/imageformats/webp/main.cpp b/src/plugins/imageformats/webp/main.cpp index 064f3ab..7e9405b 100644 --- a/src/plugins/imageformats/webp/main.cpp +++ b/src/plugins/imageformats/webp/main.cpp @@ -42,9 +42,6 @@ #ifndef QT_NO_IMAGEFORMATPLUGIN -#ifdef QT_NO_IMAGEFORMAT_WEBP -#undef QT_NO_IMAGEFORMAT_WEBP -#endif #include "qwebphandler_p.h" #include <qiodevice.h> |