diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-19 15:23:44 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-01-16 08:59:19 +0000 |
| commit | 4f48a54fdcc78416070c6846d8df4aacf36194a7 (patch) | |
| tree | 87d60510655d3bba392e563b23b9c82fbe80c5d2 /src/qml/compiler | |
| parent | bef7f9f4137d1571b4a030a5c87281be6020411a (diff) | |
Fix build without QML debugging
Change-Id: Ie1b18dd00705b1913572b87c6968a63438e7a90c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/compiler')
| -rw-r--r-- | src/qml/compiler/qv4bytecodegenerator.cpp | 2 | ||||
| -rw-r--r-- | src/qml/compiler/qv4instr_moth.cpp | 2 | ||||
| -rw-r--r-- | src/qml/compiler/qv4instr_moth_p.h | 7 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/qml/compiler/qv4bytecodegenerator.cpp b/src/qml/compiler/qv4bytecodegenerator.cpp index efa4b36f05..96d6f78eae 100644 --- a/src/qml/compiler/qv4bytecodegenerator.cpp +++ b/src/qml/compiler/qv4bytecodegenerator.cpp @@ -185,6 +185,7 @@ void BytecodeGenerator::finalize(Compiler::Context *context) } int BytecodeGenerator::addInstructionHelper(Instr::Type type, const Instr &i, int offsetOfOffset) { +#if QT_CONFIG(qml_debug) if (debugMode && type != Instr::Type::Debug) { QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Wmaybe-uninitialized") // broken gcc warns about Instruction::Debug() @@ -197,6 +198,7 @@ QT_WARNING_DISABLE_GCC("-Wmaybe-uninitialized") // broken gcc warns about Instru } QT_WARNING_POP } +#endif const int pos = instructions.size(); diff --git a/src/qml/compiler/qv4instr_moth.cpp b/src/qml/compiler/qv4instr_moth.cpp index fbc6902f3d..3a81aca7f6 100644 --- a/src/qml/compiler/qv4instr_moth.cpp +++ b/src/qml/compiler/qv4instr_moth.cpp @@ -616,10 +616,8 @@ void dumpBytecode(const char *code, int len, int nLocals, int nFormals, int /*st MOTH_BEGIN_INSTR(Ret) MOTH_END_INSTR(Ret) -#ifndef QT_NO_QML_DEBUGGER MOTH_BEGIN_INSTR(Debug) MOTH_END_INSTR(Debug) -#endif // QT_NO_QML_DEBUGGER MOTH_BEGIN_INSTR(LoadQmlContext) d << dumpRegister(result, nFormals); diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h index 6fa33facab..4eeeed1fbc 100644 --- a/src/qml/compiler/qv4instr_moth_p.h +++ b/src/qml/compiler/qv4instr_moth_p.h @@ -56,13 +56,6 @@ QT_BEGIN_NAMESPACE -#if !QT_CONFIG(qml_debug) -#define MOTH_DEBUG_INSTR(F) -#else -#define MOTH_DEBUG_INSTR(F) \ - F(Debug) -#endif - #define INSTRUCTION(op, name, nargs, ...) \ op##_INSTRUCTION(name, nargs, __VA_ARGS__) |