diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-02 12:53:54 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-02 12:53:54 +0200 |
| commit | cee7701c76579ff139b42f2092306a88f0394dc5 (patch) | |
| tree | 25eb915f22cd8172210d29e299d17b39bdc9ebfe /src/plugins/imageformats/webp | |
| parent | 9293902f325341f0c188bdf4f662c3a7d949a343 (diff) | |
| parent | a33e3aeac74c8fc8d1fff7a244083d96f9bba70f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Idd134e350e760a0237dce4ef00d10e1c35dbeb67
Diffstat (limited to 'src/plugins/imageformats/webp')
| -rw-r--r-- | src/plugins/imageformats/webp/webp.pro | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro index 405c3b7..cea7c78 100644 --- a/src/plugins/imageformats/webp/webp.pro +++ b/src/plugins/imageformats/webp/webp.pro @@ -4,9 +4,11 @@ HEADERS += qwebphandler_p.h SOURCES += main.cpp qwebphandler.cpp OTHER_FILES += webp.json -config_libwebp { - unix|win32-g++*: LIBS += -lwebp -lwebpdemux - else:win32: LIBS += libwebp.lib libwebpdemux.lib +include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) +QT_FOR_CONFIG += imageformats-private + +qtConfig(system-webp) { + QMAKE_USE += webp } else { include($$PWD/../../../3rdparty/libwebp.pri) } |