diff options
22 files changed, 62 insertions, 5 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/.gitignore b/tests/auto/qml/qqmlmoduleplugin/.gitignore new file mode 100644 index 0000000000..b458285566 --- /dev/null +++ b/tests/auto/qml/qqmlmoduleplugin/.gitignore @@ -0,0 +1,2 @@ +imports/*/*/* +!imports/com/nokia/PureQmlModule/* diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.pro b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.pro index 94dc236a4c..f69a8328b5 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.pro +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.pro @@ -5,3 +5,8 @@ QT = core qml DESTDIR = ../imports/com/nokia/AutoTestQmlNestedPluginType QT += core-private gui-private qml-private + +IMPORT_FILES = \ + qmldir + +include (../../../shared/imports.pri) diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlNestedPluginType/qmldir b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/qmldir index f6ed20dda4..f6ed20dda4 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlNestedPluginType/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.2.1.pro b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.2.1.pro index ccb66abe0e..44196e4918 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.2.1.pro +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.2.1.pro @@ -5,3 +5,8 @@ QT = core qml DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2.1 QT += core-private gui-private qml-private + +IMPORT_FILES = \ + qmldir + +include (../../../shared/imports.pri) diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/qmldir index 0a8b5d46eb..0a8b5d46eb 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.2.pro b/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.2.pro index 7f3904f695..7ecb33b085 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.2.pro +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.2.pro @@ -5,3 +5,9 @@ QT = core qml DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2 QT += core-private gui-private qml-private + +IMPORT_DIR = DESTDIR +IMPORT_FILES = \ + qmldir + +include (../../../shared/imports.pri) diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir b/tests/auto/qml/qqmlmoduleplugin/plugin.2/qmldir index 0a8b5d46eb..0a8b5d46eb 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.pro b/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.pro index dae8696cc8..32ecc60ac9 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.pro +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.pro @@ -5,3 +5,8 @@ QT = core qml DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType QT += core-private gui-private qml-private + +IMPORT_FILES = \ + qmldir + +include (../../../shared/imports.pri) diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/qmldir b/tests/auto/qml/qqmlmoduleplugin/plugin/qmldir new file mode 100644 index 0000000000..0a8b5d46eb --- /dev/null +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/qmldir @@ -0,0 +1 @@ +plugin plugin diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/Foo.qml index 36d69e901f..36d69e901f 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/Foo.qml diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/pluginMixed.pro b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/pluginMixed.pro index c0f314ab5e..52f14b1632 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/pluginMixed.pro +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/pluginMixed.pro @@ -5,3 +5,9 @@ QT = core qml DESTDIR = ../imports/com/nokia/AutoTestQmlMixedPluginType QT += core-private gui-private qml-private + +IMPORT_FILES = \ + Foo.qml \ + qmldir + +include (../../../shared/imports.pri) diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/qmldir index 065dc3b21f..065dc3b21f 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/pluginVersion.pro b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/pluginVersion.pro index ba9e4846ea..fe0878b69c 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/pluginVersion.pro +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/pluginVersion.pro @@ -5,3 +5,8 @@ QT = core qml DESTDIR = ../imports/com/nokia/AutoTestQmlVersionPluginType QT += core-private gui-private qml-private + +IMPORT_FILES = \ + qmldir + +include (../../../shared/imports.pri) diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/qmldir index 640967fe40..640967fe40 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/MyQmlFile.qml index 617bdaaf67..617bdaaf67 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/MyQmlFile.qml diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro index 15fe8d2f3e..3fb6f99768 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro @@ -5,3 +5,9 @@ QT = core qml DESTDIR = ../imports/com/nokia/AutoTestPluginWithQmlFile QT += core-private gui-private qml-private + +IMPORT_FILES = \ + qmldir \ + MyQmlFile.qml + +include (../../../shared/imports.pri) diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/qmldir index 858ba1450e..858ba1450e 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/pluginWrongCase.pro b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/pluginWrongCase.pro index d604613300..858e9d9da4 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/pluginWrongCase.pro +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/pluginWrongCase.pro @@ -6,3 +6,8 @@ TARGET = Plugin DESTDIR = ../imports/com/nokia/WrongCase QT += core-private gui-private qml-private + +IMPORT_FILES = \ + qmldir + +include (../../../shared/imports.pri) diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/WrongCase/qmldir b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/qmldir index 6c8787498f..6c8787498f 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/WrongCase/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp index f6c165840d..81aed01a73 100644 --- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp @@ -75,14 +75,18 @@ private slots: private: QString m_importsDirectory; + QString m_dataImportsDirectory; }; void tst_qqmlmoduleplugin::initTestCase() { QQmlDataTest::initTestCase(); - m_importsDirectory = directory() + QStringLiteral("/imports"); + m_importsDirectory = QFINDTESTDATA(QStringLiteral("imports")); QVERIFY2(QFileInfo(m_importsDirectory).isDir(), qPrintable(QString::fromLatin1("Imports directory '%1' does not exist.").arg(m_importsDirectory))); + m_dataImportsDirectory = directory() + QStringLiteral("/imports"); + QVERIFY2(QFileInfo(m_dataImportsDirectory).isDir(), + qPrintable(QString::fromLatin1("Imports directory '%1' does not exist.").arg(m_dataImportsDirectory))); } #define VERIFY_ERRORS(errorfile) \ @@ -222,7 +226,7 @@ void tst_qqmlmoduleplugin::remoteImportWithQuotedUrl() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - server.serveDirectory(m_importsDirectory); + server.serveDirectory(m_dataImportsDirectory); QQmlEngine engine; QQmlComponent component(&engine); @@ -243,10 +247,10 @@ void tst_qqmlmoduleplugin::remoteImportWithUnquotedUri() { TestHTTPServer server(SERVER_PORT); QVERIFY(server.isValid()); - server.serveDirectory(m_importsDirectory); + server.serveDirectory(m_dataImportsDirectory); QQmlEngine engine; - engine.addImportPath(m_importsDirectory); + engine.addImportPath(m_dataImportsDirectory); QQmlComponent component(&engine); component.setData("import com.nokia.PureQmlModule 1.0 \nComponentA { width: 300; ComponentB{} }", QUrl()); diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.pro b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.pro index 927d802898..43bd112415 100644 --- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.pro +++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.pro @@ -8,6 +8,6 @@ CONFIG -= app_bundle include (../../shared/util.pri) -TESTDATA = data/* imports/* +TESTDATA = data/* imports/* $$OUT_PWD/imports/* QT += core-private gui-private qml-private network testlib diff --git a/tests/auto/shared/imports.pri b/tests/auto/shared/imports.pri new file mode 100644 index 0000000000..20e9bcb371 --- /dev/null +++ b/tests/auto/shared/imports.pri @@ -0,0 +1,7 @@ + +copyimportfiles.input = IMPORT_FILES +copyimportfiles.output = $$DESTDIR/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} +copyimportfiles.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} +copyimportfiles.CONFIG += no_link_no_clean +copyimportfiles.variable_out = PRE_TARGETDEPS +QMAKE_EXTRA_COMPILERS += copyimportfiles |