Re-order imports statements to import nested imports later
authorMatthew Vogt <matthew.vogt@nokia.com>
Mon, 26 Mar 2012 06:39:00 +0000 (16:39 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 28 Mar 2012 22:36:49 +0000 (00:36 +0200)
commite4baefacff3e04ea3b599c5279e883d75d2ad489
treedc78ce14db08c0aa771ddff9df8c23da8b8919ba
parent5de103291d8159a236cabcc689caade265de1bd5
Re-order imports statements to import nested imports later

Re-order the imports for a script by increasing order of URI length.
This ensures that an import of the type 'import X.Y' is processed
after the import of 'import X' which contains the type definitions for
the namespace X.Y.

Task-number: QTBUG-24369
Change-Id: I1b06e9d114a97c9f47279f8f33383a27e0efb4bb
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
17 files changed:
src/qml/qml/qqmlimport.cpp
src/qml/qml/qqmlscript.cpp
src/qml/qml/qqmlscript_p.h
tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest3.qml [new file with mode: 0644]
tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
tests/auto/qml/qqmlmoduleplugin/data/importsNested.1.qml [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/data/importsNested.2.qml [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.errors.txt [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/data/importsNested.4.errors.txt [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/data/importsNested.4.qml [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/AutoTestQmlNestedPluginType/qmldir [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.cpp [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.pro [new file with mode: 0644]
tests/auto/qml/qqmlmoduleplugin/qqmlmoduleplugin.pro
tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp