path: root/configure
diff options
authorAshish Kulkarni <>2015-01-07 23:52:01 +0530
committerAshish Kulkarni <>2015-01-09 16:52:27 +0100
commitb077ed746ae91321ff9aa72ebd17a463bec98413 (patch)
treed30645aad12abfe0c90e84e61622a7e2c13f01e1 /configure
parente0981a0d9e0330fe3a1c4f310e7c9877c341ba5d (diff)
allow detection of static/shared target in the config tests
It was not possible to determine whether Qt is being built as a shared or static library in the config tests, as that information was not added to QMAKE_CONFIG used in the compileTest function. For linking to ICU on Windows, there is logic which depends on it in config.tests/unix/icu/, but was broken for the static target, as the expected library name was not found (icuXX -> sicuXX). Change-Id: I22c2d543ea14feebbad36961c9a29e99f66323ff Reviewed-by: Oswald Buddenhagen <>
Diffstat (limited to 'configure')
1 files changed, 7 insertions, 1 deletions
diff --git a/configure b/configure
index 31a59fc802..75fe189bef 100755
--- a/configure
+++ b/configure
@@ -3954,7 +3954,13 @@ compileTest()
shift 2
- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS "$@"
+ # allow config tests which behave differently depending on the type of
+ # library being built (shared/static) e.g. see config.tests/unix/icu
+ test_config="$QMAKE_CONFIG shared"
+ if [ "$CFG_SHARED" = "no" ]; then
+ test_config="$QMAKE_CONFIG static"
+ fi
+ "$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS "$@"