sigrok-cross-mingw: Revert to glib 2.44.1 for now (fixes bug #1232).

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

diff --git a/cross-compile/android/android-qt.patch b/cross-compile/android/android-qt.patch
index fc3b188d49a2a7912572af2d8074e9558682b003..762ac855da02e9ebd3c7b46f521e96aaf9103ba6 100644 (file)
--- a/cross-compile/android/android-qt.patch
+++ b/cross-compile/android/android-qt.patch
@@ -12,3 +12,13 @@ diff --git a/qtbase/mkspecs/features/qt_common.prf b/qtbase/mkspecs/features/qt_
          }
      }
      unset(ver)
+--- a/qttools/src/qdbus/qdbus.pro      2015-02-17 05:57:17.000000000 +0100
++++ b/qttools/src/qdbus/qdbus.pro      2015-04-29 15:55:19.740997627 +0200
+@@ -1,3 +1,5 @@
+ TEMPLATE = subdirs
+-SUBDIRS = qdbus
+-qtHaveModule(widgets): SUBDIRS += qdbusviewer
++!android:!ios:!qnx:!wince*:!winrt* {
++    SUBDIRS = qdbus
++    qtHaveModule(widgets): SUBDIRS += qdbusviewer
++}