]>
Commit | Line | Data |
---|---|---|
7b888971 MC |
1 | diff --git a/qtbase/mkspecs/features/qt_common.prf b/qtbase/mkspecs/features/qt_common.prf |
2 | --- a/qtbase/mkspecs/features/qt_common.prf 2014-05-16 18:41:54.964880350 +0200 | |
3 | +++ b/qtbase/mkspecs/features/qt_common.prf 2014-05-16 18:44:21.529590747 +0200 | |
2256009e MC |
4 | @@ -77,7 +77,9 @@ |
5 | QMAKE_CXXFLAGS_WARN_ON += -Wno-error=strict-overflow | |
7b888971 MC |
6 | |
7 | # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135 | |
2256009e | 8 | - android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix |
7b888971 | 9 | + contains(ver, "4\\.8") { |
2256009e | 10 | + android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix |
7b888971 MC |
11 | + } |
12 | } | |
13 | } | |
14 | unset(ver) | |
6e39ae14 JS |
15 | --- a/qttools/src/qdbus/qdbus.pro 2015-02-17 05:57:17.000000000 +0100 |
16 | +++ b/qttools/src/qdbus/qdbus.pro 2015-04-29 15:55:19.740997627 +0200 | |
17 | @@ -1,3 +1,5 @@ | |
18 | TEMPLATE = subdirs | |
19 | -SUBDIRS = qdbus | |
20 | -qtHaveModule(widgets): SUBDIRS += qdbusviewer | |
21 | +!android:!ios:!qnx:!wince*:!winrt* { | |
22 | + SUBDIRS = qdbus | |
23 | + qtHaveModule(widgets): SUBDIRS += qdbusviewer | |
24 | +} |