sigrok-fwextract-kingst-la2016: concentrate RCC flags in one spot

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

diff --git a/qtbase/mkspecs/features/qt_common.prf b/qtbase/mkspecs/features/qt_common.prf
--- a/qtbase/mkspecs/features/qt_common.prf	2014-05-16 18:41:54.964880350 +0200
+++ b/qtbase/mkspecs/features/qt_common.prf	2014-05-16 18:44:21.529590747 +0200
@@ -77,7 +77,9 @@
             QMAKE_CXXFLAGS_WARN_ON += -Wno-error=strict-overflow
 
             # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135
-            android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
+            contains(ver, "4\\.8") {
+                android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
+            }
         }
     }
     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 {