Improved error messages for malformed .import statements
authorMatthew Vogt <matthew.vogt@nokia.com>
Fri, 6 Jul 2012 03:04:53 +0000 (13:04 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 10 Jul 2012 23:49:59 +0000 (01:49 +0200)
commita1a2c81d7fd5512b8c0531b01453656fc4c96bed
tree519b6c02482c3487d64a060041e95ae09a878c49
parentf5cb65b35e076facbce45e896902a34da7036135
Improved error messages for malformed .import statements

Report errors in .import statements, rather than pass them through
to V8 to yield 'Syntax error'.

Task-number: QTBUG-24867
Change-Id: I111b3bd3d198e97f42b29591f61753e86295aeb2
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
29 files changed:
src/qml/qml/qqmlscript.cpp
src/qml/qml/qqmlscript_p.h
src/qml/qml/qqmltypeloader.cpp
src/qml/qml/qqmltypeloader_p.h
src/qml/qml/qqmlvme.cpp
tests/auto/qml/qmlmin/tst_qmlmin.cpp
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedFile.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedFile.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedFileQualifier.2.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedFileQualifier.2.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedFileQualifier.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedFileQualifier.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedImport.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedImport.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedModule.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedModule.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedModuleQualifier.2.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedModuleQualifier.2.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedModuleQualifier.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedModuleQualifier.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedModuleVersion.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/malformedModuleVersion.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/missingFileQualifier.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/missingFileQualifier.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/missingModuleQualifier.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/missingModuleQualifier.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/missingModuleVersion.js [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/data/jsimportfail/missingModuleVersion.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp