sigrok-cross-android: Add a "prepare" option to setup SDK/NDK/toolchain.

[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 f284284f34188ae5413ca491370ed3ab3f4d8307..fc3b188d49a2a7912572af2d8074e9558682b003 100644 (file)
--- a/cross-compile/android/android-qt.patch
+++ b/cross-compile/android/android-qt.patch
@@ -1,13 +1,13 @@
 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
-@@ -56,7 +56,9 @@
-             QMAKE_CXXFLAGS += -Wno-error=strict-overflow
+@@ -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 += -Wno-error=literal-suffix
+-            android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
 +            contains(ver, "4\\.8") {
-+                android: QMAKE_CXXFLAGS += -Wno-error=literal-suffix
++                android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
 +            }
          }
      }