sigrok-cross-android: Redirect SR(D) logs to Android log in PV

[sigrok-util.git] / cross-compile / android / pulseview-java.patch

diff --git a/cross-compile/android/pulseview-java.patch b/cross-compile/android/pulseview-java.patch
index 1495985075e4ab37e50af8c97029b6386f025036..6d7d04fc4f3f3a1a2dd1917867dac269415e726b 100644 (file)
--- a/cross-compile/android/pulseview-java.patch
+++ b/cross-compile/android/pulseview-java.patch
@@ -5,8 +5,9 @@ index 0564a8d..0356f33 100644
 @@ -1,5 +1,5 @@
  <?xml version='1.0' encoding='utf-8'?>
 -<manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
+-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name">
 +<manifest package="org.sigrok.pulseview" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
-     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name">
++    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name" android:icon="@drawable/logo">
          <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
                    android:name="org.qtproject.qt5.android.bindings.QtActivity"
 @@ -9,21 +9,21 @@
@@ -52,13 +53,14 @@ index bd6928f..68f017e 100644
 diff --git a/java/res/values/libs.xml b/java/res/values/libs.xml
 --- a/java/res/values/libs.xml 2014-05-17 11:09:29.855631921 +0200
 +++ b/java/res/values/libs.xml 2014-05-17 11:13:04.380841784 +0200
-@@ -13,6 +13,9 @@
+@@ -13,6 +13,10 @@
  
       <array name="qt_libs">
           <!-- %%INSERT_QT_LIBS%% -->
 +         <item>Qt5Core</item>
 +         <item>Qt5Gui</item>
 +         <item>Qt5Widgets</item>
++         <item>Qt5Svg</item>
       </array>
  
      <array name="bundled_in_lib">