diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-14 03:04:38 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-14 03:04:38 +0200 |
| commit | f396928fb5af3e9df251afed7a15175f26ece8fb (patch) | |
| tree | bdf8e279e4ac12ca109c5772ede16f3e83535b06 | |
| parent | dabcde3195e47683b31f0050c5de067863eb64e5 (diff) | |
| parent | 626c3053efd7905080ac4a65fca55551391a36e3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia0a5fe32ec96c73758933b319f5cb8f22cc9f344
| -rw-r--r-- | src/plugins/imageformats/mng/mng.pro | 6 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/tiff.pro | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index 4641110..f509fa8 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro @@ -5,8 +5,10 @@ SOURCES += main.cpp \ qmnghandler.cpp OTHER_FILES += mng.json -msvc: LIBS += libmng.lib -else: LIBS += -lmng +include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) +QT_FOR_CONFIG += imageformats-private + +QMAKE_USE_PRIVATE += mng PLUGIN_TYPE = imageformats PLUGIN_CLASS_NAME = QMngPlugin diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index 04cfbdb..0c42749 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -4,9 +4,11 @@ HEADERS += qtiffhandler_p.h SOURCES += main.cpp qtiffhandler.cpp OTHER_FILES += tiff.json -config_libtiff { - unix|mingw: LIBS += -ltiff - else:win32: LIBS += libtiff.lib +include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri) +QT_FOR_CONFIG += imageformats-private + +qtConfig(system-tiff) { + QMAKE_USE_PRIVATE += tiff } else { include($$PWD/../../../3rdparty/libtiff.pri) } |