projects / profile / ivi / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 601c738) | patch
Ensure JS files imported inside modules work correctly
authorMatthew Vogt <matthew.vogt@nokia.com>
Wed, 14 Mar 2012 02:49:36 +0000 (12:49 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 19 Mar 2012 22:20:30 +0000 (23:20 +0100)
commitc5cd60a96d19a89e466f0ad62c2f5a625aaf4d8c
tree384ace077ffc73f2e3b2de3fa261227f05ee2fcatree | snapshot
parent601c7383ab58042f914418df60b70e875a48f1d2commit | diff
Ensure JS files imported inside modules work correctly

When a module exports functionality provided by a script, ensure
that imported script modules inside that script resolve correctly.

Task-number: QTBUG-24596
Change-Id: I3885dcc56946423f0d7cf00afdcdfaa0cb11967a
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
src/qml/qml/qqmldirparser.cpp diff | blob | history
src/qml/qml/qqmldirparser_p.h diff | blob | history
src/qml/qml/qqmlimport.cpp diff | blob | history
src/qml/qml/qqmlimport_p.h diff | blob | history
src/qml/qml/qqmltypeloader.cpp diff | blob | history
src/qml/qml/qqmltypeloader_p.h diff | blob | history
tests/auto/qml/qqmlecmascript/data/jsimport/testJsImport.qml [new file with mode: 0644] blob
tests/auto/qml/qqmlecmascript/data/jsimport/testJsModuleImport.js [new file with mode: 0644] blob
tests/auto/qml/qqmlecmascript/data/lib/com/nokia/JsModule/ScriptAPI.js [new file with mode: 0644] blob
tests/auto/qml/qqmlecmascript/data/lib/com/nokia/JsModule/qmldir [new file with mode: 0644] blob
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp diff | blob | history
Domain: UI Framework / Uncategorized;