summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@digia.com>2015-08-05 15:33:43 +0300
committerTony Sarajärvi <tony.sarajarvi@digia.com>2015-08-05 12:43:27 +0000
commit6914fe2430b0a16a2929efdadcc933946b96b07d (patch)
tree10288b6679960247195ed497219cc0029967c3b7
parent18fb58ad8a5ed2da575f2830df322f16986a6e9e (diff)
Remove usage of pkg-config in OSX
Change-Id: I56cd57c39ce13dc7884066156317f4f8a17167e9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_OSX_10.10/properties/qt.configure.args2
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_OSX_10.9/properties/qt.configure.args2
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_qtnamespace_OSX_10.7/properties/qt.configure.args2
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/macx-clang_no-framework_OSX_10.8/properties/qt.configure.args2
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/macx-clang_static_OSX_10.9/properties/qt.configure.extra_args2
5 files changed, 5 insertions, 5 deletions
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_OSX_10.10/properties/qt.configure.args b/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_OSX_10.10/properties/qt.configure.args
index 6cd70d16..620034d2 100644
--- a/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_OSX_10.10/properties/qt.configure.args
+++ b/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_OSX_10.10/properties/qt.configure.args
@@ -1 +1 @@
--no-pch -release -developer-build -opensource -confirm-license -pkg-config -make libs -make tools -make examples -make tests
+-no-pch -release -developer-build -opensource -confirm-license -make libs -make tools -make examples -make tests
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_OSX_10.9/properties/qt.configure.args b/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_OSX_10.9/properties/qt.configure.args
index 0d4b6098..620034d2 100644
--- a/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_OSX_10.9/properties/qt.configure.args
+++ b/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_OSX_10.9/properties/qt.configure.args
@@ -1 +1 @@
--no-pch -release -developer-build -opensource -confirm-license -force-pkg-config -make libs -make tools -make examples -make tests
+-no-pch -release -developer-build -opensource -confirm-license -make libs -make tools -make examples -make tests
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_qtnamespace_OSX_10.7/properties/qt.configure.args b/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_qtnamespace_OSX_10.7/properties/qt.configure.args
index 18130f0f..4ee28208 100644
--- a/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_qtnamespace_OSX_10.7/properties/qt.configure.args
+++ b/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_developer-build_qtnamespace_OSX_10.7/properties/qt.configure.args
@@ -1 +1 @@
--no-pch -release -developer-build -qtnamespace TestNamespace -opensource -confirm-license -force-pkg-config -make libs -make tools -make examples -make tests -no-c++11
+-no-pch -release -developer-build -qtnamespace TestNamespace -opensource -confirm-license -make libs -make tools -make examples -make tests -no-c++11
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_no-framework_OSX_10.8/properties/qt.configure.args b/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_no-framework_OSX_10.8/properties/qt.configure.args
index 9e44a616..e486c450 100644
--- a/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_no-framework_OSX_10.8/properties/qt.configure.args
+++ b/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_no-framework_OSX_10.8/properties/qt.configure.args
@@ -1 +1 @@
--silent -no-pch -opensource -confirm-license -force-pkg-config -make libs -make tools -nomake examples -nomake tests -debug -no-framework
+-silent -no-pch -opensource -confirm-license -make libs -make tools -nomake examples -nomake tests -debug -no-framework
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_static_OSX_10.9/properties/qt.configure.extra_args b/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_static_OSX_10.9/properties/qt.configure.extra_args
index 23f2eff9..f693e2f9 100644
--- a/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_static_OSX_10.9/properties/qt.configure.extra_args
+++ b/projects/Qt_Modules_Continuous_Integration/stages/macx-clang_static_OSX_10.9/properties/qt.configure.extra_args
@@ -1 +1 @@
--no-pch -release -static -skip qtwebkit -no-icu -nomake tests -nomake examples
+-no-pch -release -static -skip qtwebkit -no-icu -nomake tests -nomake examples -no-pkg-config