summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@theqtcompany.com>2016-08-16 19:07:11 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-08-26 15:01:45 +0000
commit327c9b9e0c68550e474d9ffdc21ece6324b5e7a1 (patch)
tree238c971d1f1f8491436de26d4a6c3e0af07656ce
parent2672642af493339b3420d5e5235b77d9f560feb6 (diff)
Use pkg-config wrapper provided by qmake
Switch to pkg-config wrapper provided by qmake to avoid exporting extra PKG_CONFIG_LIBDIR paths. Change-Id: I6c916d8d20965808af7b206c4fecf6c8791e93b4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/gyp_run.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 2264d9b70..71c1e063c 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -19,6 +19,8 @@ cross_compile {
GYP_CONFIG += qtwe_process_name_debug=$$QTWEBENGINEPROCESS_NAME_DEBUG
GYP_CONFIG += qtwe_process_name_release=$$QTWEBENGINEPROCESS_NAME_RELEASE
GYP_CONFIG += disable_glibcxx_debug=1
+!contains(QT_CONFIG, no-pkg-config): GYP_CONFIG += pkg-config=$$pkgConfigExecutable()
+
!webcore_debug: GYP_CONFIG += remove_webcore_debug_symbols=1
!v8base_debug: GYP_CONFIG += remove_v8base_debug_symbols=1