[Qt] Do not unconditionally use pkg-config in .pro files
authorAdemar de Souza Reis Junior <ademar.reis@openbossa.org>
Tue, 30 Aug 2011 13:57:37 +0000 (13:57 +0000)
committerAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Tue, 30 Aug 2011 17:50:58 +0000 (14:50 -0300)
commitfb3b4700aa5abbb2db471b4f0eb7946ce4850cc4
tree551a8de9160ac538808ea3ebd3fae079ab5cebc2
parentb017396bf391ba05a448262e290a6609cfe7f275
[Qt] Do not unconditionally use pkg-config in .pro files
https://bugs.webkit.org/show_bug.cgi?id=67055

Reviewed by Andreas Kling.

Original patch from Rohan McGovern <rohan.mcgovern@nokia.com>

Using the first pkg-config in PATH is prone to errors when cross
compiling inside the Qt repository (using Qt's build-system).

This patch protect calls for pkg-config with
!contains(QT_CONFIG, no-pkg-config). no-pkg-config is added to
QT_CONFIG by Qt's 'configure' when cross-compiling on systems
without pkg-config.

The respective change in Qt's configure has been submited already.

No new tests as this is just a build change.

Source/JavaScriptCore:

* wtf/wtf.pri: protect pkg-config calls

Source/WebCore:

* features.pri: protect pkg-config calls

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@94075 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/wtf/wtf.pri
Source/WebCore/ChangeLog
Source/WebCore/features.pri