projects / profile / ivi / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5e33b0f) | patch
Report clashing qmldir entries for components and scripts
authorMatthew Vogt <matthew.vogt@nokia.com>
Tue, 19 Jun 2012 02:57:57 +0000 (12:57 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 21 Jun 2012 22:13:20 +0000 (00:13 +0200)
commit57e3325affbe8bbb8edcc2c6d072db28aee46438
tree697e45faf1b8f4b3cb8cb9e465e443c169df6332tree | snapshot
parent5e33b0f580d2b20f1a2989bf2ee8dde4525a2e39commit | diff
Report clashing qmldir entries for components and scripts

If a qmldir contains multiple lines that install the same versioned
property for a single component name or script qualifier, report an
error rather than silently suppress one entry.

Task-number: QTBUG-25834
Change-Id: I25d3a24102a5a4fa3d82f1d31d7e52505026fff7
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
src/qml/qml/qqmlimport.cpp diff | blob | history
tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test1.qml [new file with mode: 0644] blob
tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test2.qml [new file with mode: 0644] blob
tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/qmldir [new file with mode: 0644] blob
tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/qmldir [new file with mode: 0644] blob
tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test1.js [new file with mode: 0644] blob
tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test2.js [new file with mode: 0644] blob
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp diff | blob | history
Domain: UI Framework / Uncategorized;