diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-30 03:28:47 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-30 18:21:32 +0200 |
commit | 62ee548d5fb8cbcbc4f126f761f125891dd79aed (patch) | |
tree | 79628c29245320ca3c17d7647c72653d2e308ba1 /src/qml/qml/qqmlvme_p.h | |
parent | c48d727e25f0a07d709a81765af6196bc0ddb4c5 (diff) |
Fix support for JS imports in QML files in the new compiler
Remove the v4 value initialization for imported scripts code out of the VME
(the method didn't even need any members of the VME class) and into ScriptData,
for re-use on the QmlObjectCreator side.
Also add the script index setup for the import cache (used by qml context
wrapper) to the type loader.
Change-Id: Idc3953a48f6fb66d008008e88a2b9b556c775537
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme_p.h')
-rw-r--r-- | src/qml/qml/qqmlvme_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h index 09e3237aee..5e76143cca 100644 --- a/src/qml/qml/qqmlvme_p.h +++ b/src/qml/qml/qqmlvme_p.h @@ -151,7 +151,6 @@ private: , void *const**storeJumpTable = 0 #endif ); - QV4::PersistentValue run(QQmlContextData *, QQmlScriptData *); #ifdef QML_THREADED_VME_INTERPRETER static void *const*instructionJumpTable(); |