aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/imports.pro
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-04-05 14:10:08 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-05 07:21:51 +0200
commit5874e29b851101291a93278351da32a5cdbade9c (patch)
treeee15bf62778906e7acec6dc783ade5b78dab954d /src/imports/imports.pro
parent82a048c3cff06dd6e9a97a72d235decb1a39e1c3 (diff)
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>
Diffstat (limited to 'src/imports/imports.pro')
-rw-r--r--src/imports/imports.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index b62275b009..f7861ac009 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,5 +1,5 @@
TEMPLATE = subdirs
-SUBDIRS += qtquick2 folderlistmodel localstorage
+SUBDIRS += qtquick2 particles window folderlistmodel localstorage
contains(QT_CONFIG, qmltest): SUBDIRS += testlib
contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel