diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-10-10 10:09:03 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-10-10 10:09:03 (GMT) |
| commit | 542b153ca9b7a863985ae5fded7e87dd6f5d1368 (patch) | |
| tree | 8058511ca19765a088df65f2f413b26b4ffe884f | |
| parent | c95aceed470c4e134d31489af21c78564ddee1aa (diff) | |
| parent | 77fbebd52359d2bc6410738da522cd5b408fdd45 (diff) | |
| download | mxe-542b153ca9b7a863985ae5fded7e87dd6f5d1368.zip mxe-542b153ca9b7a863985ae5fded7e87dd6f5d1368.tar.gz mxe-542b153ca9b7a863985ae5fded7e87dd6f5d1368.tar.bz2 | |
merge
| -rw-r--r-- | src/qt-1-win32.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/qt-1-win32.patch b/src/qt-1-win32.patch index a78404a..0272522 100644 --- a/src/qt-1-win32.patch +++ b/src/qt-1-win32.patch @@ -1768,3 +1768,28 @@ index 3f1ac86..602cb8d 100644 contains(QT_CONFIG, embedded):CONFIG += embedded CONFIG(QTDIR_build) { + +commit f9b9cf2a816380f70e41155344a769c2ad71ad28 +Author: Mark Brand <mabrand@mabrand.nl> +Date: Sun Oct 10 11:14:20 2010 +0200 + + use specified pkg-config + + Respect the pkg-config tool specified in qmake.conf. This is + useful when crossbuilding. + +diff --git a/mkspecs/features/link_pkgconfig.prf b/mkspecs/features/link_pkgconfig.prf +index 4c528aa..90cc836 100644 +--- a/mkspecs/features/link_pkgconfig.prf ++++ b/mkspecs/features/link_pkgconfig.prf +@@ -1,6 +1,7 @@ + # handle pkg-config files ++isEmpty(PKG_CONFIG):PKG_CONFIG=pkg-config + for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) { +- QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB) +- QMAKE_CFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB) +- LIBS += $$system(pkg-config --libs $$PKGCONFIG_LIB) ++ QMAKE_CXXFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB) ++ QMAKE_CFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB) ++ LIBS += $$system($$PKG_CONFIG --libs $$PKGCONFIG_LIB) + } |