From 5874e29b851101291a93278351da32a5cdbade9c Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Thu, 5 Apr 2012 14:10:08 +1000 Subject: 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 --- src/imports/particles/particles.pro | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/imports/particles/particles.pro (limited to 'src/imports/particles/particles.pro') diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro new file mode 100644 index 0000000000..dc3198d124 --- /dev/null +++ b/src/imports/particles/particles.pro @@ -0,0 +1,19 @@ +TARGET = particlesplugin +TARGETPATH = QtQuick/Particles.2 +include(../qimportbase.pri) + +SOURCES += \ + plugin.cpp + +QT += quick-private qml-private + +OTHER_FILES += \ + qmldir + +DESTDIR = $$QT.qml.imports/$$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH + +qmldir.files += $$PWD/qmldir +qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH + +INSTALLS += target qmldir -- cgit v1.2.3