diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-10-11 15:15:44 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-10-11 15:16:02 (GMT) |
| commit | 89a853370d94373c6ef1c9fabcfb5bf19c20f7c9 (patch) | |
| tree | 13aecc83eddf57d20dab87cc91aba6e8b0af4bef /mkspecs/features | |
| parent | b1a8c2e50a7d8768da97a9782c393a0cb29458f6 (diff) | |
| download | Qt-89a853370d94373c6ef1c9fabcfb5bf19c20f7c9.zip Qt-89a853370d94373c6ef1c9fabcfb5bf19c20f7c9.tar.gz Qt-89a853370d94373c6ef1c9fabcfb5bf19c20f7c9.tar.bz2 | |
use specified pkg-config
Respect the pkg-config tool specified in qmake.conf. This is
useful when crossbuilding.
Merge-request: 850
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/link_pkgconfig.prf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/features/link_pkgconfig.prf b/mkspecs/features/link_pkgconfig.prf index 4c528aa..d70e5de 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) } |