Create plugins for Particles and Window submodules
authorMatthew Vogt <matthew.vogt@nokia.com>
Thu, 5 Apr 2012 04:10:08 +0000 (14:10 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 5 Apr 2012 05:21:51 +0000 (07:21 +0200)
commit5874e29b851101291a93278351da32a5cdbade9c
treeee15bf62778906e7acec6dc783ade5b78dab954d
parent82a048c3cff06dd6e9a97a72d235decb1a39e1c3
Create plugins for Particles and Window submodules

To prevent errors when QML files import QtQuick.Particles or
QtQuick.Window before importing QtQuick itself, create plugins for
these submodules that make their import statements independent of
the QtQuick import.

Remove the automatic re-ordering of the imports list prior to loading
to ensure registered name conflicts can be resolved by changing the
order of import statements.

Task-number: QTBUG-24369
Change-Id: I248625fa30a813dddd2a64feb9a489768931939f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
17 files changed:
src/imports/imports.pro
src/imports/particles/particles.pro [new file with mode: 0644]
src/imports/particles/plugin.cpp [new file with mode: 0644]
src/imports/particles/qmldir [new file with mode: 0644]
src/imports/window/plugin.cpp [new file with mode: 0644]
src/imports/window/qmldir [new file with mode: 0644]
src/imports/window/window.pro [new file with mode: 0644]
src/qml/qml/qqmlscript.cpp
src/qml/qml/qqmlscript_p.h
src/quick/items/qquickwindowmodule_p.h
src/quick/particles/qquickparticlesmodule_p.h
src/quick/qtquick2.cpp
tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest3.qml [deleted file]
tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
tests/auto/qml/qqmlmoduleplugin/data/importsNested.1.errors.txt [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp