Make qqmlmoduleplugin tests pass in shadow builds.
authorAndrew den Exter <andrew.den-exter@nokia.com>
Thu, 17 May 2012 04:38:33 +0000 (14:38 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 24 May 2012 07:42:42 +0000 (09:42 +0200)
commit9539b88b7c36efb582f225fb1207db4fc27d3f49
tree97f122b4f99ed29647d057165fdac68a17d03360
parent2a5d05dd3c9d42794d6863425598b8a838ebfb63
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>
22 files changed:
tests/auto/qml/qqmlmoduleplugin/.gitignore [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.pro
tests/auto/qml/qqmlmoduleplugin/nestedPlugin/qmldir [moved from tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlNestedPluginType/qmldir with 100% similarity]
tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.2.1.pro
tests/auto/qml/qqmlmoduleplugin/plugin.2.1/qmldir [moved from tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir with 100% similarity]
tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.2.pro
tests/auto/qml/qqmlmoduleplugin/plugin.2/qmldir [moved from tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir with 100% similarity]
tests/auto/qml/qqmlmoduleplugin/plugin/plugin.pro
tests/auto/qml/qqmlmoduleplugin/plugin/qmldir [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/pluginMixed/Foo.qml [moved from tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml with 100% similarity]
tests/auto/qml/qqmlmoduleplugin/pluginMixed/pluginMixed.pro
tests/auto/qml/qqmlmoduleplugin/pluginMixed/qmldir [moved from tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir with 100% similarity]
tests/auto/qml/qqmlmoduleplugin/pluginVersion/pluginVersion.pro
tests/auto/qml/qqmlmoduleplugin/pluginVersion/qmldir [moved from tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir with 100% similarity]
tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/MyQmlFile.qml [moved from tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml with 100% similarity]
tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro
tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/qmldir [moved from tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir with 100% similarity]
tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/pluginWrongCase.pro
tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/qmldir [moved from tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/WrongCase/qmldir with 100% similarity]
tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.pro
tests/auto/shared/imports.pri [new file with mode: 0644]