diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-11 13:22:19 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 16:01:24 +0200 |
commit | 886c359ebb86afcad3a62ce6cf7697fd7d6a1ea8 (patch) | |
tree | 7fa2b17387920f0b70e67e3cac70f3c6a3425635 /src/qml/jsruntime/qv4value_def_p.h | |
parent | a9cf828559b00bc70f59250b7f3cf38458774715 (diff) |
Fix build on Android with -developer-build
That configuration implies -Werror for some kind of warnings. This patch fixes
* Mix of different types in conditional (qv4isel_masm.cpp)
* Noreturn function returning instead of calling another noreturn function at the end (qv4engine_cxxabi.cpp)
* An out-of-line function being declared inline
Task-Number: QTBUG-33998
Change-Id: I3ba58dcadeac6774c5de63e6bb551354a2f23332
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4value_def_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4value_def_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4value_def_p.h b/src/qml/jsruntime/qv4value_def_p.h index c8d03cfeed..82f8d02dfe 100644 --- a/src/qml/jsruntime/qv4value_def_p.h +++ b/src/qml/jsruntime/qv4value_def_p.h @@ -242,7 +242,7 @@ struct Q_QML_EXPORT Value void setDouble(double d) { dbl = d; } bool isNaN() const { return (tag & QV4::Value::NotDouble_Mask) == QV4::Value::NaN_Mask; } #endif - inline bool isString() const; + bool isString() const; inline bool isObject() const; inline bool isInt32() { if (tag == _Integer_Type) |