Fix build on Android with -developer-build
authorSimon Hausmann <simon.hausmann@digia.com>
Fri, 11 Oct 2013 11:22:19 +0000 (13:22 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 11 Oct 2013 14:01:24 +0000 (16:01 +0200)
commit886c359ebb86afcad3a62ce6cf7697fd7d6a1ea8
tree7fa2b17387920f0b70e67e3cac70f3c6a3425635
parenta9cf828559b00bc70f59250b7f3cf38458774715
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>
src/qml/compiler/qv4isel_masm.cpp
src/qml/jsruntime/qv4engine_cxxabi.cpp
src/qml/jsruntime/qv4value_def_p.h