diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2013-10-01 10:14:54 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-01 11:55:38 +0200 |
commit | 543023c43e347c76abbd4b6c25eea29e673c19dd (patch) | |
tree | dd291d8001c4f7259aaac0dfb657b0859f36bc60 /src | |
parent | 3fbe74cb0b6f01ca930bf4f22f25b4976cbe1ac3 (diff) |
Fix compilation on Android with 4.8 toolchain
Change-Id: I1ce4ec8c9c671f0130c1530c772c1dd74f1fb1f4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/compiler/qv4isel_masm_p.h | 6 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4exception_p.h | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4unwindhelper_arm_p.h | 14 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 2 |
5 files changed, 17 insertions, 10 deletions
diff --git a/src/qml/compiler/qv4isel_masm_p.h b/src/qml/compiler/qv4isel_masm_p.h index c233af0b99..fd84b03b77 100644 --- a/src/qml/compiler/qv4isel_masm_p.h +++ b/src/qml/compiler/qv4isel_masm_p.h @@ -1207,6 +1207,8 @@ public: done.link(this); #else Q_ASSERT(!"Not tested on this platform!"); + Q_UNUSED(reg) + Q_UNUSED(addr) #endif } @@ -1473,6 +1475,8 @@ private: Assembler::ScratchRegister); #else Q_ASSERT(!"Not supported on this platform!"); + Q_UNUSED(source) + Q_UNUSED(target) #endif } else if (target->kind == V4IR::Temp::StackSlot) { #if CPU(X86_64) || CPU(X86) @@ -1481,6 +1485,8 @@ private: _as->storeDouble(Assembler::FPGpr0, _as->stackSlotPointer(target)); #else Q_ASSERT(!"Not supported on this platform!"); + Q_UNUSED(source) + Q_UNUSED(target) #endif } else { Q_UNIMPLEMENTED(); diff --git a/src/qml/jsruntime/qv4exception_p.h b/src/qml/jsruntime/qv4exception_p.h index eaeebf7abd..4777e56fa9 100644 --- a/src/qml/jsruntime/qv4exception_p.h +++ b/src/qml/jsruntime/qv4exception_p.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace QV4 { struct Q_QML_EXPORT Exception { - static void throwException(ExecutionContext *throwingContext, const Value &exceptionValue); + static void Q_NORETURN throwException(ExecutionContext *throwingContext, const Value &exceptionValue); ~Exception(); @@ -72,7 +72,7 @@ private: ExecutionContext *throwingContext; bool accepted; ExecutionEngine::StackTrace m_stackTrace; - static void throwInternal(ExecutionContext *throwingContext, const Value &exceptionValue); + static void Q_NORETURN throwInternal(ExecutionContext *throwingContext, const Value &exceptionValue); }; } // namespace QV4 diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index f9e1c400e1..6b55a09486 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -621,6 +621,7 @@ QVariant SequencePrototype::toVariant(QV4::Object *object) FOREACH_QML_SEQUENCE_TYPE(SEQUENCE_TO_VARIANT) { /* else */ return QVariant(); } } +#undef SEQUENCE_TO_VARIANT #define SEQUENCE_TO_VARIANT(ElementType, ElementTypeName, SequenceType, unused) \ if (typeHint == qMetaTypeId<SequenceType>()) { \ return QQml##ElementTypeName##List::toVariant(a); \ diff --git a/src/qml/jsruntime/qv4unwindhelper_arm_p.h b/src/qml/jsruntime/qv4unwindhelper_arm_p.h index e768544e11..52ffdd5e92 100644 --- a/src/qml/jsruntime/qv4unwindhelper_arm_p.h +++ b/src/qml/jsruntime/qv4unwindhelper_arm_p.h @@ -95,13 +95,13 @@ pop lr pop r0, r1, r2, r3 */ -#define REG_TO_SP 0b10010000 -#define VSP_MINUS 0b01000000 -#define POP_REG_MULTI 0b10000000 -#define POP_R4_MULTI 0b10100000 -#define POP_R4_R14_MULTI 0b10101000 -#define POP_R0_TO_R3 0b10110001 -#define FINISH 0b10110000 +#define REG_TO_SP ((unsigned int) 0b10010000) +#define VSP_MINUS ((unsigned int) 0b01000000) +#define POP_REG_MULTI ((unsigned int) 0b10000000) +#define POP_R4_MULTI ((unsigned int) 0b10100000) +#define POP_R4_R14_MULTI ((unsigned int) 0b10101000) +#define POP_R0_TO_R3 ((unsigned int) 0b10110001) +#define FINISH ((unsigned int) 0b10110000) #define MK_UW_WORD(first, second, third, fourth) \ (((first) << 24) | \ diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp index 96be4d3be0..b079100a37 100644 --- a/src/quick/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -103,7 +103,7 @@ QSGTexturePrivate::QSGTexturePrivate() static int qt_debug_texture_count = 0; -#if defined(Q_OS_LINUX) || defined (Q_OS_MAC) +#if (defined(Q_OS_LINUX) || defined (Q_OS_MAC)) && !defined(Q_OS_ANDROID) DEFINE_BOOL_CONFIG_OPTION(qmlDebugLeakBacktrace, QML_DEBUG_LEAK_BACKTRACE) #define BACKTRACE_SIZE 20 |