diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-14 13:39:13 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 04:07:11 +0100 |
| commit | e4fec8ece464dd7055505b4c90afad5c9a6390cf (patch) | |
| tree | 0abdd782d2ab1966b35be004413ff8b734838a60 /tests/auto/declarative/shared/qdeclarativedatatest.cpp | |
| parent | b05039d5efcaec69d01d3737ccb5f0199765632b (diff) | |
Copy qmldir files into build tree with associated plugins.
The qdeclarativemoduleplugin test verifies that the plugins it
constructs are correctly imported. Ths requires that the qmldir
files that describe the plugins are copied into the build tree
along with the plugins they refer to.
QML (and .js, where relevant) files must also be copied into
the same directory if they form part of the imported module.
Change-Id: I827a0b678a17cac42aadc4f2176fdd8bd693aab1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/declarative/shared/qdeclarativedatatest.cpp')
| -rw-r--r-- | tests/auto/declarative/shared/qdeclarativedatatest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/declarative/shared/qdeclarativedatatest.cpp b/tests/auto/declarative/shared/qdeclarativedatatest.cpp index 12fc9d13..626da488 100644 --- a/tests/auto/declarative/shared/qdeclarativedatatest.cpp +++ b/tests/auto/declarative/shared/qdeclarativedatatest.cpp @@ -52,11 +52,13 @@ QDeclarativeDataTest *QDeclarativeDataTest::m_instance = 0; QDeclarativeDataTest::QDeclarativeDataTest() : #ifdef QT_TESTCASE_BUILDDIR m_dataDirectory(QTest::qFindTestData("data", QT_DECLARATIVETEST_DATADIR, 0, QT_TESTCASE_BUILDDIR)), + m_importsDirectory(QTest::qFindTestData("imports", QT_DECLARATIVETEST_IMPORTSDIR, 0, QT_TESTCASE_BUILDDIR)), #else m_dataDirectory(QTest::qFindTestData("data", QT_DECLARATIVETEST_DATADIR, 0)), + m_importsDirectory(QTest::qFindTestData("imports", QT_DECLARATIVETEST_IMPORTSDIR, 0)), #endif - - m_dataDirectoryUrl(QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))) + m_dataDirectoryUrl(QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))), + m_importsDirectoryUrl(QUrl::fromLocalFile(m_importsDirectory + QLatin1Char('/'))) { m_instance = this; } |