diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-04-05 14:10:08 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-05 07:21:51 +0200 |
| commit | 5874e29b851101291a93278351da32a5cdbade9c (patch) | |
| tree | ee15bf62778906e7acec6dc783ade5b78dab954d /tests/auto/qml/qqmllanguage | |
| parent | 82a048c3cff06dd6e9a97a72d235decb1a39e1c3 (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 'tests/auto/qml/qqmllanguage')
3 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest3.qml b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest3.qml deleted file mode 100644 index 26a5d6bba9..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest3.qml +++ /dev/null @@ -1,2 +0,0 @@ -import QtQuick 2.0 -Rectangle {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir index ce51ecae1a..b301226099 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir +++ b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir @@ -1,3 +1,2 @@ InstalledTest 1.4 InstalledTest2.qml InstalledTestTP 0.0 InstalledTest.qml -Rectangle 1.5 InstalledTest3.qml diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index f70b212231..4720269313 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -1881,21 +1881,19 @@ void tst_qqmllanguage::importsOrder_data() << (!qmlCheckTypes()?"QQuickRectangle":"") << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest/ in version 1.0 and 1.4") << false; - - // Note: imports are now reordered by increasing order of URI length QTest::newRow("installed import versus builtin 1") << - "import com.nokia.installedtest0 1.5\n" "import com.nokia.installedtest 1.5\n" + "import QtQuick 2.0\n" "Rectangle {}" << (!qmlCheckTypes()?"QQuickRectangle":"") - << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/com/nokia/installedtest0/ and in ") + << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in file://") << true; QTest::newRow("installed import versus builtin 2") << "import QtQuick 2.0\n" "import com.nokia.installedtest 1.5\n" "Rectangle {}" << (!qmlCheckTypes()?"QQuickText":"") - << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/com/nokia/installedtest/ and in ") + << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/com/nokia/installedtest/ and in file://") << true; QTest::newRow("namespaces cannot be overridden by types 1") << "import QtQuick 2.0 as Rectangle\n" |