diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-08-08 13:27:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-08 15:35:13 +0200 |
| commit | f50153e6c6726a06f246f54f1dfe7842d95b5ed9 (patch) | |
| tree | fe63837fdad0b7f566883034f06b4e9b3a23bde0 /src | |
| parent | 3cefb43441a9879cc512dc3fcc7dca0d42e9ca8c (diff) | |
The Moth VME is actually part of the runtime, not the compiler
Change-Id: Idcb7a6b6157c58e33192f86750ded487c0e75b9f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/compiler/compiler.pri | 4 | ||||
| -rw-r--r-- | src/qml/jsruntime/jsruntime.pri | 6 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4vme_moth.cpp (renamed from src/qml/compiler/qv4vme_moth.cpp) | 0 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4vme_moth_p.h (renamed from src/qml/compiler/qv4vme_moth_p.h) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri index 61578fd011..ac04d960ef 100644 --- a/src/qml/compiler/compiler.pri +++ b/src/qml/compiler/compiler.pri @@ -8,7 +8,6 @@ HEADERS += \ $$PWD/qv4isel_masm_p.h \ $$PWD/qv4isel_p.h \ $$PWD/qv4jsir_p.h \ - $$PWD/qv4vme_moth_p.h \ $$PWD/qv4instr_moth_p.h \ $$PWD/qv4isel_moth_p.h \ $$PWD/qv4isel_util_p.h \ @@ -21,7 +20,6 @@ SOURCES += \ $$PWD/qv4isel_moth.cpp \ $$PWD/qv4isel_p.cpp \ $$PWD/qv4jsir.cpp \ - $$PWD/qv4ssa.cpp \ - $$PWD/qv4vme_moth.cpp + $$PWD/qv4ssa.cpp include(../../3rdparty/masm/masm.pri) diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri index a8f5f11a50..8f5ea81d5e 100644 --- a/src/qml/jsruntime/jsruntime.pri +++ b/src/qml/jsruntime/jsruntime.pri @@ -46,7 +46,8 @@ SOURCES += \ $$PWD/qv4qobjectwrapper.cpp \ $$PWD/qv4qmlextensions.cpp \ $$PWD/qv4stacktrace.cpp \ - $$PWD/qv4exception.cpp + $$PWD/qv4exception.cpp \ + $$PWD/qv4vme_moth.cpp HEADERS += \ $$PWD/qv4global_p.h \ @@ -96,7 +97,8 @@ HEADERS += \ $$PWD/qv4qobjectwrapper_p.h \ $$PWD/qv4qmlextensions_p.h \ $$PWD/qv4stacktrace_p.h \ - $$PWD/qv4exception_p.h + $$PWD/qv4exception_p.h \ + $$PWD/qv4vme_moth_p.h # Use SSE2 floating point math on 32 bit instead of the default # 387 to make test results pass on 32 and on 64 bit builds. diff --git a/src/qml/compiler/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp index a06ce4139a..a06ce4139a 100644 --- a/src/qml/compiler/qv4vme_moth.cpp +++ b/src/qml/jsruntime/qv4vme_moth.cpp diff --git a/src/qml/compiler/qv4vme_moth_p.h b/src/qml/jsruntime/qv4vme_moth_p.h index 59692500ba..59692500ba 100644 --- a/src/qml/compiler/qv4vme_moth_p.h +++ b/src/qml/jsruntime/qv4vme_moth_p.h |