Fix Qt.include with cached compilation units and resources
authorSimon Hausmann <simon.hausmann@digia.com>
Mon, 4 Aug 2014 13:27:24 +0000 (15:27 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Wed, 6 Aug 2014 07:56:49 +0000 (09:56 +0200)
commit2121de6d8762ec2fc90a07e207824090e8447291
treef061114b33c8b52ecc947e7b69bd7d0eef126a42
parentc85bfba382ca1ddf0573c8f59e95b25f804b83ff
Fix Qt.include with cached compilation units and resources

Similar to the worker scripts we also need to do a lookup for cached
scripts here. Added also a test to ensure that Qt.include works correctly
from Qt resources.

Change-Id: Idb67af3da4b0cc91edbd3d2746d074fd68ed8bf0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/qml/jsruntime/qv4include.cpp
tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
tests/auto/qml/qqmlecmascript/qqmlecmascript.qrc [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp