diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-25 13:18:59 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-01 14:50:28 (GMT) |
| commit | 1fb11ed3532a0e47c8a4539600973e880b4cb78f (patch) | |
| tree | 4469ad016e4831997cecc6963c994d90d4bec9f2 /config.tests/unix | |
| parent | 2fd65bf3f5015fc9ff830b4a8709fe65d9644f17 (diff) | |
| download | Qt-1fb11ed3532a0e47c8a4539600973e880b4cb78f.zip Qt-1fb11ed3532a0e47c8a4539600973e880b4cb78f.tar.gz Qt-1fb11ed3532a0e47c8a4539600973e880b4cb78f.tar.bz2 | |
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/unix')
| -rwxr-xr-x | config.tests/unix/compile.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index b8f6743..f484f03 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 |