diff options
| -rw-r--r-- | config.tests/libmng/libmng.pro | 2 | ||||
| -rw-r--r-- | config.tests/libtiff/libtiff.pro | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/mng/qmnghandler.pri | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/tiff.pro | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro index 7a45825..adc096e 100644 --- a/config.tests/libmng/libmng.pro +++ b/config.tests/libmng/libmng.pro @@ -2,5 +2,5 @@ SOURCES = libmng.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle win32:CONFIG += console -unix|win32-g++*: LIBS += -lmng +unix|mingw: LIBS += -lmng else:win32: LIBS += libmng.lib diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro index 47a8437..f7ac4c1 100644 --- a/config.tests/libtiff/libtiff.pro +++ b/config.tests/libtiff/libtiff.pro @@ -2,5 +2,5 @@ SOURCES = libtiff.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle win32:CONFIG += console -unix|win32-g++*: LIBS += -ltiff +unix|mingw: LIBS += -ltiff else:win32: LIBS += libtiff.lib diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index fc05522..74efbbb 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -1,7 +1,7 @@ # zlib dependency satisfied by bundled 3rd party zlib or system zlib contains(QT_CONFIG, system-zlib) { - if(unix|win32-g++*): LIBS_PRIVATE += -lz - else: LIBS += zdll.lib + unix|mingw: LIBS_PRIVATE += -lz + else: LIBS += zdll.lib } else { load(qt_build_paths) git_build: \ diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri index cdf17c5..5c0fff1 100644 --- a/src/plugins/imageformats/mng/qmnghandler.pri +++ b/src/plugins/imageformats/mng/qmnghandler.pri @@ -3,7 +3,7 @@ INCLUDEPATH *= $$PWD HEADERS += $$PWD/qmnghandler_p.h SOURCES += $$PWD/qmnghandler.cpp config_libmng { - unix|win32-g++*: LIBS += -lmng + unix|mingw: LIBS += -lmng else:win32: LIBS += libmng.lib } else { include($$PWD/../../../3rdparty/libmng.pri) diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index 353e3f3..0f841ab 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -10,7 +10,7 @@ wince*: SOURCES += qfunctions_wince.cpp OTHER_FILES += tiff.json config_libtiff { - unix|win32-g++*: LIBS += -ltiff + unix|mingw: LIBS += -ltiff else:win32: LIBS += libtiff.lib } else { include($$PWD/../../../3rdparty/libtiff.pri) |