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/qdeclarativeecmascript | |
| 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/qdeclarativeecmascript')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index a8c8508891..f4c2638f95 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -4,13 +4,13 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeecmascript.cpp \ testtypes.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp HEADERS += testtypes.h \ - ../../shared/testhttpserver.h \ - ../../shared/util.h + ../../shared/testhttpserver.h INCLUDEPATH += ../../shared +include (../../shared/util.pri) + # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov |