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/shared | |
| 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/shared')
| -rw-r--r-- | tests/auto/shared/util.cpp | 7 | ||||
| -rw-r--r-- | tests/auto/shared/util.pri | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp index a9d4bbce30..d5d639361d 100644 --- a/tests/auto/shared/util.cpp +++ b/tests/auto/shared/util.cpp @@ -50,7 +50,12 @@ QDeclarativeDataTest *QDeclarativeDataTest::m_instance = 0; QDeclarativeDataTest::QDeclarativeDataTest() : - m_dataDirectory(QFINDTESTDATA("data")), +#ifdef QT_TESTCASE_BUILDDIR + m_dataDirectory(QTest::qFindTestData("data", QT_DECLARATIVETEST_DATADIR, 0, QT_TESTCASE_BUILDDIR)), +#else + m_dataDirectory(QTest::qFindTestData("data", QT_DECLARATIVETEST_DATADIR, 0)), +#endif + m_dataDirectoryUrl(QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))) { m_instance = this; diff --git a/tests/auto/shared/util.pri b/tests/auto/shared/util.pri new file mode 100644 index 0000000000..916e5fb32a --- /dev/null +++ b/tests/auto/shared/util.pri @@ -0,0 +1,5 @@ + +HEADERS += $$PWD/util.h +SOURCES += $$PWD/util.cpp + +DEFINES += QT_DECLARATIVETEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\" |