diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 16:27:13 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 16:27:13 +0100 |
| commit | cfac0f3a89bd92955047bf15908a2e7bedd91db0 (patch) | |
| tree | f7352a1d81edff983b1b5d027d985b4e1a0514bd /mkspecs | |
| parent | c2d213becf8f96257789ebeb3ab074733da36424 (diff) | |
| parent | 707610b9f07ad96318e6d84f321588c060c0c294 (diff) | |
| download | qt4-tools-cfac0f3a89bd92955047bf15908a2e7bedd91db0.tar.gz | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove the installer from the Qt sources.
Fixes qabstractslider autotest
Add a recursive rule for running the auto-tests.
Do not run the tests automatically during install.
Fixes scrolling horizontally with a mouse wheel over sliders.
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
A fix for accidently reused variable names in nested iterations.
Iain's changes for 4.6.2
Doc: Fixed typo.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index 525e7b2c1a..e0b22f2c74 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -13,23 +13,19 @@ symbian:{ # prefix test binary with tst_ !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") -######################################################################## -# Use install rule to run test application. -# This lets you do 'make install' on a test to both build and run it, -# and lets you easily build and run all tests from the parent directory. -# ---------------------------------------------------------------------- -runme.files = -runme.path = . -!isEmpty(DESTDIR): runme.commands = cd ./$(DESTDIR) && -macx: runme.commands += ./$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) -else:unix: runme.commands += ./$(QMAKE_TARGET) +check.files = +check.path = . +!isEmpty(DESTDIR): check.commands = cd ./$(DESTDIR) && +macx: check.commands += ./$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) +else:unix: check.commands += ./$(QMAKE_TARGET) else:win32: { - CONFIG(debug, debug|release):runme.commands += debug\\$(QMAKE_TARGET) - else:runme.commands += release\\$(QMAKE_TARGET) + CONFIG(debug, debug|release):check.commands += debug\\$(QMAKE_TARGET) + else:check.commands += release\\$(QMAKE_TARGET) } -embedded: runme.commands += -qws -INSTALLS += runme +embedded: check.commands += -qws +QMAKE_EXTRA_TARGETS += check -######################################################################## +target.path += $$[QT_INSTALL_PREFIX]/tests/qt4 +INSTALLS += target |