Go to file
Rohan McGovern 638fc2e4c6 Do not unconditionally use pkg-config in .pro files
Using the first pkg-config in PATH is prone to errors when
cross compiling.  This is a known issue, and `configure' already
avoids using pkg-config for cross compiling (unless -force-pkg-config is
used).  However, there was previously no way for a .pro file to test
whether or not the user had passed -force-pkg-config.

Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it
is safe to run pkg-config.

(cherry picked from commit 53794d94994cb3149581b1a91762dfa2d6defac0)

Change-Id: I53794d94994cb3149581b1a91762dfa2d6defac0
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6488
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-10-12 18:01:19 +02:00
bin Prevent 'Argument "" isn't numeric' warning when module version is missing 2011-10-11 13:25:40 +02:00
config.tests Fix warning caused by putting .mm files in SOURCES 2011-09-26 16:05:36 +02:00
dist Rename QMetaType::construct() to create() 2011-10-11 16:01:45 +02:00
doc/src Rename QMetaType::construct() to create() 2011-10-11 16:01:45 +02:00
examples Clean-up a macro for Cocoa 2011-10-10 07:47:58 +02:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Fixed CONFIG+=declarative_debug with QT+=declarative-private 2011-10-11 05:26:32 +02:00
qmake Make CONFIG+=GNUmake respect shadow builds 2011-10-11 21:00:07 +02:00
src Fix construction races in QtNetwork 2011-10-11 19:16:10 +02:00
tests Avoid building empty, inapplicable QWS tests. 2011-10-12 18:01:19 +02:00
tools Use freetype font engine on Windows 2011-10-10 13:17:44 +02:00
util Move the documentation for the classes to their modules. 2011-10-03 09:56:09 +02:00
.gitattributes Added .tag file with Git revision. 2011-05-03 16:23:49 +02:00
.gitignore Update .gitignore 2011-10-03 05:58:44 +02:00
.gitmodules Add QtV8 library to QtBase 2011-08-29 10:16:01 +02:00
.tag Added .tag file with Git revision. 2011-05-03 16:23:49 +02:00
configure Do not unconditionally use pkg-config in .pro files 2011-10-12 18:01:19 +02:00
configure.exe New configure.exe binary 2011-09-05 08:55:31 +02:00
header.BSD Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
header.FDL Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
header.LGPL Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
header.LGPL-ONLY Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
INSTALL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LGPL_EXCEPTION.txt Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.LGPL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.PREVIEW.COMMERCIAL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
qtbase.pro Fix make confclean 2011-09-12 16:03:47 +02:00
sync.profile Remove uilib and QtUiTools from QtBase 2011-09-13 20:11:40 +02:00