diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-24 10:36:10 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-01 09:12:52 +0100 |
| commit | 3385fb91e1e55e1bfa1f78dfb8ce2e9f3fdaedef (patch) | |
| tree | b77bb527bf3a21dc95a317248b2640c73751f629 /tests/auto/corelib/kernel/qobject | |
| parent | 13eba9ddf47d570fc4562c20fcfbacd1dfa4a61a (diff) | |
Fixed installation of corelib tests
In .pro files, removed wince/symbian-specific DEPLOYMENT cases and
replaced them with TESTDATA where appropriate.
In .cpp files, removed SRCDIR and relative paths to testdata and
replaced them with the QFINDTESTDATA macro where appropriate.
Modified test helper apps/libs to install themselves under the test
they relate to.
This change allows corelib tests to be correctly installed, along with
their testdata, via `make install'.
Change-Id: I5e202e2f3b577af7e39072d5c9fe13e0ca125304
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qobject')
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/signalbug.pro | 8 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/tst_qobject.pro | 6 |
3 files changed, 5 insertions, 12 deletions
diff --git a/tests/auto/corelib/kernel/qobject/signalbug.pro b/tests/auto/corelib/kernel/qobject/signalbug.pro index a835264a93..ed3adf0242 100644 --- a/tests/auto/corelib/kernel/qobject/signalbug.pro +++ b/tests/auto/corelib/kernel/qobject/signalbug.pro @@ -1,7 +1,3 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Tue Aug 15 13:45:41 2006 -###################################################################### - TEMPLATE = app TARGET = DEPENDPATH += . @@ -16,4 +12,6 @@ wince*: { HEADERS += signalbug.h SOURCES += signalbug.cpp - +# This app is testdata for tst_qobject +target.path = $$[QT_INSTALL_TESTS]/tst_qobject +INSTALLS += target diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 1b5e3bd79e..b20b98da54 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -2796,7 +2796,8 @@ void tst_QObject::dynamicProperties() void tst_QObject::recursiveSignalEmission() { QProcess proc; - proc.start("./signalbug"); + // signalbug helper app should always be next to this test binary + proc.start(QCoreApplication::applicationDirPath() + "/signalbug"); QVERIFY(proc.waitForFinished()); QVERIFY(proc.exitStatus() == QProcess::NormalExit); QCOMPARE(proc.exitCode(), 0); diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/tst_qobject.pro index bbc02ce34d..e13852629c 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.pro +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.pro @@ -6,9 +6,3 @@ SOURCES = tst_qobject.cpp # this is here for a reason, moc_oldnormalizedobject.cpp is not auto-generated, it was generated by # moc from Qt 4.6, and should *not* be generated by the current moc SOURCES += moc_oldnormalizeobject.cpp - -wince* { - addFiles.files = signalbug.exe - addFiles.path = . - DEPLOYMENT += addFiles -} |