From d99454b20a23c4717c74cfb827f86cc0cca16eb3 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 11 Jan 2011 21:40:39 +1000 Subject: Attempt to cure my pathological inability to type the word "package". Reviewed-by: Trust Me --- doc/src/platforms/platform-notes.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index e7d7cb4..aac6bb0 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -426,7 +426,7 @@ details. \note A MinGW installation is only needed to build against the - binary pacakge, not to run the pre-compiled binaries that are in + binary package, not to run the pre-compiled binaries that are in the package. \section2 Intel C++ Compiler (Windows, Altix) -- cgit v0.12 From 9c2019dc09f4c8faed454c33b6d3e1756d938fac Mon Sep 17 00:00:00 2001 From: Lucian Varlan Date: Mon, 10 Jan 2011 15:36:17 +0200 Subject: Do not override the target path if already defined Reviewed-by: Adrian Constantin --- mkspecs/features/qttest_p4.prf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index d1c7c2b..193812b 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -13,5 +13,8 @@ symbian:{ # prefix test binary with tst_ !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") -target.path += $$[QT_INSTALL_PREFIX]/tests/qt4 +isEmpty(target.path) { + target.path += $$[QT_INSTALL_PREFIX]/tests/qt4 +} + INSTALLS += target -- cgit v0.12 From 8c42998d3080d4cd824767f7396e44f8e5dcad23 Mon Sep 17 00:00:00 2001 From: Adrian Constantin Date: Mon, 10 Jan 2011 15:37:50 +0200 Subject: Install each test in a separate directory It prevents collision of test data. Reviewed-by: Lucian Varlan --- mkspecs/features/qttest_p4.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index 193812b..5002058 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -14,7 +14,7 @@ symbian:{ !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") isEmpty(target.path) { - target.path += $$[QT_INSTALL_PREFIX]/tests/qt4 + target.path += $$[QT_INSTALL_PREFIX]/tests/qt4/$${TARGET} } INSTALLS += target -- cgit v0.12