sigrok-cross-android: Adapt PulseView for Qt5

[sigrok-util.git] / cross-compile / android / sigrok-cross-android

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 5e08bda3fc69fd593ddc9147ad3e2bc506e69504..76e149b64388a1872f4d43752627af66f3b61ab2 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -316,12 +316,14 @@ cd ..
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
 patch -p1 < ../../pulseview-cpp.patch
-cmake $CM -DQT_QMAKE_EXECUTABLE=${PREFIX}/bin/qmake -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl .
+cmake $CM -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl .
 make $PARALLEL
 cp -r "$PREFIX"/src/android/java .
 cp -r libs java/
 cd java
 patch -p2 < ../../../pulseview-java.patch
+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/