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
+ }
}
}
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
++}