Mercurial > mxe-octave

comparison src/qtimageformats-1.patch @ 4222:44b1a9b2193e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -0400
parents
children 2c34ec679fb3
comparison
equal deleted inserted replaced
4221:1cac12604314 4222:44b1a9b2193e
1 This file is part of MXE.
2 See index.html for further information.
3
4 From 30f968c6f65c5668a9760ccfd48312b786ab318b Mon Sep 17 00:00:00 2001
5 From: Mark Brand <mabrand@mabrand.nl>
6 Date: Thu, 3 Nov 2011 14:11:02 +0100
7 Subject: [PATCH 1/2] add pkg-config support for libtiff-4
8
9 Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd
10
11 diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
12 index f7ac4c1..bd2c6b0 100644
13 --- a/config.tests/libtiff/libtiff.pro
14 +++ b/config.tests/libtiff/libtiff.pro
15 @@ -2,5 +2,7 @@ SOURCES = libtiff.cpp
16 CONFIG -= qt dylib
17 mac:CONFIG -= app_bundle
18 win32:CONFIG += console
19 -unix|mingw: LIBS += -ltiff
20 +CONFIG += link_pkgconfig
21 +packagesExist(libtiff-4):PKGCONFIG += libtiff-4
22 +else:if(unix|win32-g++*): LIBS += -ltiff
23 else:win32: LIBS += libtiff.lib
24 diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
25 index 0f841ab..fa22141 100644
26 --- a/src/plugins/imageformats/tiff/tiff.pro
27 +++ b/src/plugins/imageformats/tiff/tiff.pro
28 @@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp
29 OTHER_FILES += tiff.json
30
31 config_libtiff {
32 - unix|mingw: LIBS += -ltiff
33 + CONFIG += link_pkgconfig
34 + packagesExist(libtiff-4):PKGCONFIG += libtiff-4
35 + else:if(unix|win32-g++*): LIBS += -ltiff
36 else:win32: LIBS += libtiff.lib
37 } else {
38 include($$PWD/../../../3rdparty/libtiff.pri)
39 --
40 1.8.4.5
41
42
43 From c791e0599f640cf637d5f925b111dbd7a5569244 Mon Sep 17 00:00:00 2001
44 From: Mark Brand <mabrand@mabrand.nl>
45 Date: Wed, 19 Dec 2012 23:29:52 +0100
46 Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific)
47
48 Change-Id: I1216f35a01a974321efa2463b687c121baa22667
49
50 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro
51 index adc096e..a20a0a0 100644
52 --- a/config.tests/libmng/libmng.pro
53 +++ b/config.tests/libmng/libmng.pro
54 @@ -2,5 +2,7 @@ SOURCES = libmng.cpp
55 CONFIG -= qt dylib
56 mac:CONFIG -= app_bundle
57 win32:CONFIG += console
58 -unix|mingw: LIBS += -lmng
59 +CONFIG += link_pkgconfig
60 +packagesExist(libmng):PKGCONFIG += libmng
61 +else:if(unix|win32-g++*): LIBS += -lmng
62 else:win32: LIBS += libmng.lib
63 diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri
64 index 5c0fff1..00cd0b3 100644
65 --- a/src/plugins/imageformats/mng/qmnghandler.pri
66 +++ b/src/plugins/imageformats/mng/qmnghandler.pri
67 @@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD
68 HEADERS += $$PWD/qmnghandler_p.h
69 SOURCES += $$PWD/qmnghandler.cpp
70 config_libmng {
71 - unix|mingw: LIBS += -lmng
72 + CONFIG += link_pkgconfig
73 + packagesExist(libmng):PKGCONFIG += libmng
74 + else:if(unix|win32-g++*): LIBS += -lmng
75 else:win32: LIBS += libmng.lib
76 } else {
77 include($$PWD/../../../3rdparty/libmng.pri)
78 --
79 1.8.4.5
80