diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-12-22 11:30:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-03 02:27:06 +0100 |
| commit | c661cdc4fa8a3ba69c6b435f9d4916ad2ac7bf84 (patch) | |
| tree | 09072612ef57c52bf3032f52746c74efa0a7b115 /tests/auto/declarative/debugger | |
| parent | 0f36211f84d8cf7d478c844ff48d1b618f7ae24f (diff) | |
Fix test failures with shadow builds.
QFINDTESTDATA uses __FILE__ to determine the source directory, which
means it finds the wrong source directory when the macro is used from
a shared base class. Define the correct source directory in a pri
file and include that wherever QDeclarativeDataTest is used.
Change-Id: If3ef435f4bb3049733f49402338303c8b440f1fa
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/declarative/debugger')
3 files changed, 12 insertions, 14 deletions
diff --git a/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro b/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro index f51b1f3b35..5618995b4d 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro +++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro @@ -3,19 +3,18 @@ TARGET = tst_qdeclarativedebugjs QT += declarative-private testlib macx:CONFIG -= app_bundle -HEADERS += ../shared/debugutil_p.h \ - ../../../shared/util.h +HEADERS += ../shared/debugutil_p.h SOURCES += tst_qdeclarativedebugjs.cpp \ - ../shared/debugutil.cpp \ - ../../../shared/util.cpp + ../shared/debugutil.cpp INCLUDEPATH += ../shared +include (../../../shared/util.pri) + testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles - CONFIG += parallel_test OTHER_FILES += data/test.qml data/test.js \ diff --git a/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro b/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro index 112c8f015f..487c63aaca 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro +++ b/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro @@ -2,15 +2,14 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugtrace macx:CONFIG -= app_bundle -HEADERS += ../shared/debugutil_p.h \ - ../../../shared/util.h +HEADERS += ../shared/debugutil_p.h SOURCES += tst_qdeclarativedebugtrace.cpp \ - ../shared/debugutil.cpp \ - ../../../shared/util.cpp - + ../shared/debugutil.cpp OTHER_FILES += data/test.qml +include (../../../shared/util.pri) + CONFIG += parallel_test declarative_debug QT += declarative-private testlib diff --git a/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro b/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro index 6ef72350e9..eb57dff2fe 100644 --- a/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro +++ b/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro @@ -2,12 +2,12 @@ CONFIG += testcase TARGET = tst_qv8profilerservice macx:CONFIG -= app_bundle -HEADERS += ../shared/debugutil_p.h \ - ../../../shared/util.h +HEADERS += ../shared/debugutil_p.h SOURCES += tst_qv8profilerservice.cpp \ - ../shared/debugutil.cpp \ - ../../../shared/util.cpp + ../shared/debugutil.cpp + +include (../../../shared/util.pri) OTHER_FILES += data/test.qml |