sigrok-cross-mingw: Temporarily unbreak Windows CI builds in dirty ways.

[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..417cee5aabc14b9f106a6b14bdda476ed5af516f 100644 (file)
--- a/cross-compile/android/android-qt.patch
+++ b/cross-compile/android/android-qt.patch
@@ -12,3 +12,25 @@ 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
++}
+--- 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 {