diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2014-05-20 21:53:39 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2014-05-21 09:59:00 (GMT) |
| commit | ebc859ef6c714792c383b3be39e809e7e04bb017 (patch) | |
| tree | 6edfa52c181c3bf397d059179576af09cde7994b /src/qtimageformats-1.patch | |
| parent | f341eb3780d1e04a97e352f7d959e7a8d6a1c79d (diff) | |
| download | mxe-ebc859ef6c714792c383b3be39e809e7e04bb017.zip mxe-ebc859ef6c714792c383b3be39e809e7e04bb017.tar.gz mxe-ebc859ef6c714792c383b3be39e809e7e04bb017.tar.bz2 | |
update qt5 modules
Diffstat (limited to 'src/qtimageformats-1.patch')
| -rw-r--r-- | src/qtimageformats-1.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/qtimageformats-1.patch b/src/qtimageformats-1.patch index 30e5fcd..4edb348 100644 --- a/src/qtimageformats-1.patch +++ b/src/qtimageformats-1.patch @@ -1,7 +1,7 @@ This file is part of MXE. See index.html for further information. -From 44d6697bd01bbd489c90d3a0f64cd8ecfcb29eb3 Mon Sep 17 00:00:00 2001 +From 30f968c6f65c5668a9760ccfd48312b786ab318b Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 14:11:02 +0100 Subject: [PATCH 1/2] add pkg-config support for libtiff-4 @@ -9,27 +9,27 @@ Subject: [PATCH 1/2] add pkg-config support for libtiff-4 Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro -index 47a8437..bd2c6b0 100644 +index f7ac4c1..bd2c6b0 100644 --- a/config.tests/libtiff/libtiff.pro +++ b/config.tests/libtiff/libtiff.pro @@ -2,5 +2,7 @@ SOURCES = libtiff.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle win32:CONFIG += console --unix|win32-g++*: LIBS += -ltiff +-unix|mingw: LIBS += -ltiff +CONFIG += link_pkgconfig +packagesExist(libtiff-4):PKGCONFIG += libtiff-4 +else:if(unix|win32-g++*): LIBS += -ltiff else:win32: LIBS += libtiff.lib diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro -index 353e3f3..fa22141 100644 +index 0f841ab..fa22141 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp OTHER_FILES += tiff.json config_libtiff { -- unix|win32-g++*: LIBS += -ltiff +- unix|mingw: LIBS += -ltiff + CONFIG += link_pkgconfig + packagesExist(libtiff-4):PKGCONFIG += libtiff-4 + else:if(unix|win32-g++*): LIBS += -ltiff @@ -40,7 +40,7 @@ index 353e3f3..fa22141 100644 1.8.4.5 -From 8dea742660bb9d1196c4b05cf5b22fb4f4e41595 Mon Sep 17 00:00:00 2001 +From c791e0599f640cf637d5f925b111dbd7a5569244 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 19 Dec 2012 23:29:52 +0100 Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific) @@ -48,27 +48,27 @@ Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific) Change-Id: I1216f35a01a974321efa2463b687c121baa22667 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro -index 7a45825..a20a0a0 100644 +index adc096e..a20a0a0 100644 --- a/config.tests/libmng/libmng.pro +++ b/config.tests/libmng/libmng.pro @@ -2,5 +2,7 @@ SOURCES = libmng.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle win32:CONFIG += console --unix|win32-g++*: LIBS += -lmng +-unix|mingw: LIBS += -lmng +CONFIG += link_pkgconfig +packagesExist(libmng):PKGCONFIG += libmng +else:if(unix|win32-g++*): LIBS += -lmng else:win32: LIBS += libmng.lib diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri -index cdf17c5..00cd0b3 100644 +index 5c0fff1..00cd0b3 100644 --- a/src/plugins/imageformats/mng/qmnghandler.pri +++ b/src/plugins/imageformats/mng/qmnghandler.pri @@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD HEADERS += $$PWD/qmnghandler_p.h SOURCES += $$PWD/qmnghandler.cpp config_libmng { -- unix|win32-g++*: LIBS += -lmng +- unix|mingw: LIBS += -lmng + CONFIG += link_pkgconfig + packagesExist(libmng):PKGCONFIG += libmng + else:if(unix|win32-g++*): LIBS += -lmng |