summaryrefslogtreecommitdiff
path: root/config.tests
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-02-25 14:18:59 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-01 15:50:28 +0100
commit1fb11ed3532a0e47c8a4539600973e880b4cb78f (patch)
tree4469ad016e4831997cecc6963c994d90d4bec9f2 /config.tests
parent2fd65bf3f5015fc9ff830b4a8709fe65d9644f17 (diff)
downloadqt4-tools-1fb11ed3532a0e47c8a4539600973e880b4cb78f.tar.gz
Introduce compileTest function.
This avoids the enormous duplication of identical command line arguments passed down to compile.test. This necessitates the addition of a -config parameter to compile.test, as QMAKE_CONFIG needs to be extended in some cases. Backport of qtbase commit ca4823505bee3674a8d65cd1bdd45ea93546114b. Change-Id: I22aa0336443d330e49e674e5484f08c43c913d31 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'config.tests')
-rwxr-xr-xconfig.tests/unix/compile.test4
1 files changed, 4 insertions, 0 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
index b8f67433f8..f484f03430 100755
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -19,6 +19,10 @@ MAC_ARCH_LFLAGS=""
while [ "$#" -gt 0 ]; do
PARAM=$1
case $PARAM in
+ -config)
+ QMAKE_CONFIG="$QMAKE_CONFIG $2"
+ shift
+ ;;
-framework)
LFLAGS="$LFLAGS -framework \"$2\""
shift