diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-21 09:29:58 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-21 09:31:01 +0200 |
| commit | 41f75250d5b391dd99a84712fa68f606ef5c06b9 (patch) | |
| tree | 4911506e0d88ba2741861b0baf107270018ef17d /src/qml/qml/qqmltypeloader_p.h | |
| parent | 200a869441562d62e7fc0867599097e0599f0411 (diff) | |
| parent | 642b2ce0e155df452821a84726a2b0226cb65f70 (diff) | |
Merge branch 'wip/v4' of qtdeclarative into dev
Pull in the remaining bits of the new compiler/vme branch.
Change-Id: I4706011c5eaf35f893d0733c4e130a31ce0ebb66
Diffstat (limited to 'src/qml/qml/qqmltypeloader_p.h')
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index a2d07bbe2f..be1ffba09e 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -459,6 +459,7 @@ private: QQmlScript::Parser scriptParser; // --- new compiler QScopedPointer<QtQml::ParsedQML> parsedQML; + QList<QQmlScript::Import> m_newImports; // --- QList<ScriptReference> m_scripts; |