# HG changeset patch
# User Mark Brand <mabrand@mabrand.nl>
# Date 1286702382 -7200
# Node ID b15592673739bc841a74da724aa410eb4236b926
# Parent  8150ea76fd48d832b85f13e7507598a876e30c73
package qt: fix for cross pkg-config

diff -r 8150ea76fd48 -r b15592673739 src/qt-1-win32.patch
--- a/src/qt-1-win32.patch	Sat Oct 09 21:14:46 2010 +1100
+++ b/src/qt-1-win32.patch	Sun Oct 10 11:19:42 2010 +0200
@@ -1768,3 +1768,28 @@
  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)
+ }