From c661cdc4fa8a3ba69c6b435f9d4916ad2ac7bf84 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Thu, 22 Dec 2011 11:30:03 +1000 Subject: 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 --- tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/declarative/qdeclarativeqt') diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index 8b40936d9b..5ed808831c 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qdeclarativeqt -SOURCES += tst_qdeclarativeqt.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativeqt.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle -- cgit v1.2.3