From: Uwe Hermann <redacted>
Date: Sat, 18 Jan 2020 13:36:41 +0000 (+0100)
Subject: sigrok-cross-android: Enable Qt translations support.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=12d9516ec3a7d511db14866b5226fe7891380e3e;p=sigrok-util.git

sigrok-cross-android: Enable Qt translations support.

An additional workaround is needed in android-qt.patch, since there
is an (upstream) build issue in "qtplugininfo" from qttools.
---

diff --git a/cross-compile/android/android-qt.patch b/cross-compile/android/android-qt.patch
index 762ac85..417cee5 100644
--- a/cross-compile/android/android-qt.patch
+++ b/cross-compile/android/android-qt.patch
@@ -22,3 +22,15 @@ diff --git a/qtbase/mkspecs/features/qt_common.prf b/qtbase/mkspecs/features/qt_
 +    SUBDIRS = qdbus
 +    qtHaveModule(widgets): SUBDIRS += qdbusviewer
 +}
+--- a/qttools/src/src.pro	2020-01-17 17:05:25.333379076 +0100
++++ b/qttools/src/src.pro	2020-01-17 17:05:32.037403499 +0100
+@@ -14,8 +14,7 @@ qtHaveModule(widgets) {
+ }
+ 
+ SUBDIRS += linguist \
+-    qdoc \
+-    qtplugininfo
++    qdoc
+ if(!android|android_app):!ios: SUBDIRS += qtpaths
+ 
+ mac {
diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index a88f1c3..817b0ae 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -466,21 +466,18 @@ CC= CXX= ./configure \
 	-android-arch "$TARGET_ARCH" \
 	-android-toolchain-version "$NDK_TOOLCHAIN_VERSION" \
 	-skip qtconnectivity \
-	-skip qtdeclarative \
 	-skip qtlocation \
 	-skip qtmultimedia \
 	-skip qtscript \
 	-skip qtsensors \
 	-skip qtserialport \
-	-skip qttools \
-	-skip qttranslations \
 	-skip qtwebchannel \
 	-skip qtwebsockets \
 	-skip qtxmlpatterns \
 	-opensource -confirm-license -silent -no-warnings-are-errors
 export ANDROID_API_VERSION=android-$VER_AND_API
 export ANDROID_BUILD_TOOLS_REVISION=$VER_AND_BT
-make module-qtbase module-qtandroidextras module-qtsvg module-qtimageformats $PARALLEL $V
+make module-qtbase module-qtandroidextras module-qtsvg module-qtimageformats module-qttranslations $PARALLEL $V
 make install $V
 cd ..