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/qtquick2/qquicktext/qquicktext.pro | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/qtquick2/qquicktext') diff --git a/tests/auto/qtquick2/qquicktext/qquicktext.pro b/tests/auto/qtquick2/qquicktext/qquicktext.pro index 5c55714605..b483bebc61 100644 --- a/tests/auto/qtquick2/qquicktext/qquicktext.pro +++ b/tests/auto/qtquick2/qquicktext/qquicktext.pro @@ -5,10 +5,10 @@ macx:CONFIG -= app_bundle SOURCES += tst_qquicktext.cpp INCLUDEPATH += ../../shared/ -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h -SOURCES += ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += ../../shared/testhttpserver.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . -- cgit v1.2.3