diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-11-21 12:29:40 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-11-21 12:29:40 +0100 |
| commit | d373d5e7d70e968cfba8957596ed6fe4f46990c8 (patch) | |
| tree | c52bf2b0fbbfdb13d644b4050aa7a931ef4b7109 /src/qml/compiler/qqmltypecompiler_p.h | |
| parent | 9880acb424fd814501ba5fc4ae1caa989e23fafa (diff) | |
| parent | 9af8a47746b69b6040fc149c1d24602a1e25b08f (diff) | |
Merge remote-tracking branch 'origin/wip/new-backend' into dev
Conflicts:
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4jsir_p.h
src/qml/jsruntime/qv4engine_p.h
src/qml/jsruntime/qv4vme_moth.cpp
tests/auto/qml/qml.pro
Change-Id: Ia7b6ec24c7fcbcbb1786d9e798d2df294020ae37
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler_p.h')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h index 4878a90641..d905b956c7 100644 --- a/src/qml/compiler/qqmltypecompiler_p.h +++ b/src/qml/compiler/qqmltypecompiler_p.h @@ -111,8 +111,6 @@ public: int registerString(const QString &str); - QV4::IR::Module *jsIRModule() const; - const QV4::CompiledData::Unit *qmlUnit() const; QUrl url() const { return typeData->finalUrl(); } |