diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-05-17 14:38:33 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-24 09:42:42 +0200 |
| commit | 9539b88b7c36efb582f225fb1207db4fc27d3f49 (patch) | |
| tree | 97f122b4f99ed29647d057165fdac68a17d03360 /tests/auto/qml/qqmlmoduleplugin/imports | |
| parent | 2a5d05dd3c9d42794d6863425598b8a838ebfb63 (diff) | |
Make qqmlmoduleplugin tests pass in shadow builds.
The plugin binary and qml files for a module need to be in the same
directory. This was solved for source builds because the files were
already located in the import path, but with shadow builds the files
were split between the build and source trees. To solve this we copy
the files to the import path when doing a build. So no files are
copied on top of themselves all mixed module files have been relocated
to their module source directory.
Change-Id: I238af998a0f766e67ed6d0023e5ab4c2a4ea67af
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin/imports')
9 files changed, 0 insertions, 18 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml b/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml deleted file mode 100644 index 617bdaaf67..0000000000 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml +++ /dev/null @@ -1,3 +0,0 @@ -import QtQuick 2.0 - -Item {} diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir b/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir deleted file mode 100644 index 858ba1450e..0000000000 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -MyQmlFile 1.0 MyQmlFile.qml -plugin pluginWithQmlFile - diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml b/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml deleted file mode 100644 index 36d69e901f..0000000000 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.0 - -Item { - property int value: 89 -} diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir b/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir deleted file mode 100644 index 065dc3b21f..0000000000 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -plugin pluginMixed -Foo 1.5 Foo.qml diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlNestedPluginType/qmldir b/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlNestedPluginType/qmldir deleted file mode 100644 index f6ed20dda4..0000000000 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlNestedPluginType/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin nestedPlugin diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir b/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir deleted file mode 100644 index 0a8b5d46eb..0000000000 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin plugin diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir b/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir deleted file mode 100644 index 0a8b5d46eb..0000000000 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin plugin diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir b/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir deleted file mode 100644 index 640967fe40..0000000000 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin pluginVersion diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/WrongCase/qmldir b/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/WrongCase/qmldir deleted file mode 100644 index 6c8787498f..0000000000 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/WrongCase/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin PluGin |