From: Marcus Comstedt <redacted>
Date: Mon, 7 Jul 2014 21:12:21 +0000 (+0200)
Subject: sigrok-cross-android: Bump Qt version to 5.3
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=2256009ec977da0bb8f8181511ab4d21cd8856a8;p=sigrok-util.git

sigrok-cross-android: Bump Qt version to 5.3
---

diff --git a/cross-compile/android/android-qt.patch b/cross-compile/android/android-qt.patch
index f284284..fc3b188 100644
--- a/cross-compile/android/android-qt.patch
+++ b/cross-compile/android/android-qt.patch
@@ -1,13 +1,13 @@
 diff --git a/qtbase/mkspecs/features/qt_common.prf b/qtbase/mkspecs/features/qt_common.prf
 --- a/qtbase/mkspecs/features/qt_common.prf	2014-05-16 18:41:54.964880350 +0200
 +++ b/qtbase/mkspecs/features/qt_common.prf	2014-05-16 18:44:21.529590747 +0200
-@@ -56,7 +56,9 @@
-             QMAKE_CXXFLAGS += -Wno-error=strict-overflow
+@@ -77,7 +77,9 @@
+             QMAKE_CXXFLAGS_WARN_ON += -Wno-error=strict-overflow
  
              # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135
--            android: QMAKE_CXXFLAGS += -Wno-error=literal-suffix
+-            android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
 +            contains(ver, "4\\.8") {
-+                android: QMAKE_CXXFLAGS += -Wno-error=literal-suffix
++                android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
 +            }
          }
      }
diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 43355fb..8412bff 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -63,7 +63,7 @@ VER_LIBFTDI1=1.1
 VER_LIBUSBX=1.0.17
 VER_PYTHON=3.3.3
 VER_BOOST=1.55.0
-VER_QT=5.2.1
+VER_QT=5.3.1
 
 SF_MIRROR=switch.dl.sourceforge.net
 
@@ -307,7 +307,7 @@ $WGET http://download.qt-project.org/official_releases/qt/${VER_QT%.*}/${VER_QT}
 tar xfz qt-everywhere-opensource-src-${VER_QT}.tar.gz
 cd qt-everywhere-opensource-src-${VER_QT}
 patch -p1 < ../../android-qt.patch
-./configure --prefix="$PREFIX" -developer-build -xplatform android-g++ -nomake tests -nomake examples -android-sdk "$ANDROID_SDK" -android-ndk "$ANDROID_NDK" -android-ndk-host "$NDK_HOST" -android-arch "$TARGET_ARCH" -android-toolchain-version "$NDK_TOOLCHAIN_VERSION" -skip qttranslations -skip qtwebkit -skip qtserialport -skip qtwebkit-examples -opensource -confirm-license
+./configure --prefix="$PREFIX" -developer-build -xplatform android-g++ -nomake tests -nomake examples -android-sdk "$ANDROID_SDK" -android-ndk "$ANDROID_NDK" -android-ndk-host "$NDK_HOST" -android-arch "$TARGET_ARCH" -android-toolchain-version "$NDK_TOOLCHAIN_VERSION" -skip qttranslations -skip qtwebkit -skip qtserialport -skip qtwebkit-examples -skip qtlocation -skip qtconnectivity -opensource -confirm-license
 make $PARALLEL
 make install
 cd ..
@@ -323,8 +323,6 @@ cp -r libs java/
 mkdir -p java/res/drawable
 cp icons/sigrok-logo-notext.png java/res/drawable/logo.png
 cd java
-cp "$PREFIX"/jar/QtAndroid-bundled.jar libs/
-cp "$PREFIX"/jar/QtAndroidAccessibility-bundled.jar libs/
 mkdir -p assets
 READELF=$TOOLCHAIN_TRIPLET-readelf ../../../fix-libraries.sh "$PREFIX/lib" libs/"$TARGET_ARCH" libpulseview.so > assets/liblist.txt
 cp -r "$PREFIX"/lib/python3.3 assets/