Details
-
Bug
-
Resolution: Unresolved
-
P4: Low
-
None
-
5.2.0 Alpha
-
None
-
Ubuntu 13.04
android-4.2.2
android-ndk-r9
Description
Error compilation for Android.
Successful built after below changes:
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 694935b..191c898 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -867,7 +867,7 @@ static void android_default_message_handler(QtMsgType type, const QMessageLogContext &context, const QString &message) { - android_LogPriority priority; + android_LogPriority priority = android_LogPriority::ANDROID_LOG_UNKNOWN; switch (type) { case QtTraceMsg: case QtDebugMsg: priority = ANDROID_LOG_DEBUG; break; diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h index 2535161..c420e2c 100644 --- a/src/qml/jsruntime/qv4context_p.h +++ b/src/qml/jsruntime/qv4context_p.h @@ -145,7 +145,7 @@ struct Q_QML_EXPORT ExecutionContext // Can only be called from within catch(...), rethrows if no JS exception. ReturnedValue catchException(StackTrace *trace = 0); - void Q_NORETURN rethrowException(); + void rethrowException(); void mark(); diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index e70ac7b..c7302c3 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -326,11 +326,11 @@ struct Q_QML_EXPORT ExecutionEngine StackTrace exceptionStackTrace; void Q_NORETURN throwException(const ValueRef value); - void Q_NORETURN rethrowException(ExecutionContext *intermediateCatchingContext); + void rethrowException(ExecutionContext *intermediateCatchingContext); ReturnedValue catchException(ExecutionContext *catchingContext, StackTrace *trace); void Q_NORETURN throwInternal(); - void Q_NORETURN rethrowInternal(); + void rethrowInternal(); // ---- diff --git a/src/qml/jsruntime/qv4value_def_p.h b/src/qml/jsruntime/qv4value_def_p.h index 24d62cf..94941a1 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)
Configure script:
#!/bin/bash unset QTDIR export PATH="$PWD/qtbase/bin:$PWD/qtrepotools/bin:$PATH" NDK_TOOLCHAIN_VERSION=4.8 PLATFORM=18 export ANDROID_BUILD_TOOLS_REVISION=android-4.2.2 export ANDROID_NDK_ROOT=/home/user/android-ndk-r9 export ANDROID_SDK_ROOT=/home/user/android-studio/sdk export ANDROID_NDK_HOST=linux-x86_64 export ANDROID_NDK_TOOLCHAIN_VERSION=$NDK_TOOLCHAIN_VERSION export ANDROID_PLATFORM=$PLATFORM export ANDROID_NDK_PLATFORM=android-$PLATFORM export ANDROID_API_VERSION=android-$PLATFORM # git submodule foreach --recursive "git clean -dfx" # ./configure -release -developer-build -opensource -confirm-license -xplatform android-g++ -nomake tests -nomake examples -android-toolchain-version $NDK_TOOLCHAIN_VERSION -skip qttranslations -skip qtwebkit -skip qtserialport -skip qtwebkit-examples make -j5