diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-26 12:58:23 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-26 15:10:33 +0000 |
commit | dbc983a513a6dff9973490d013b144812ec707aa (patch) | |
tree | b75055ff2750ac0035c186ea817c53cb653e1bbe /mkspecs/common/android-base-tail.conf | |
parent | edf96b984d406cb7c00eb83f1b7e8588ac663c1f (diff) |
Revert "Detect C standard and try using the most recent"
The change causes a crash when compiling the xkbcommon 3rdparty
library and compile failures (qtimageformats on Android).
This reverts commit a47cb146809e32f43449dcfe9932833c2f0ab987.
Task-number: QTBUG-67326
Task-number: QTBUG-67327
Change-Id: I5ddc4eccad699e3eaec535fd6a63d11b0026b42e
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'mkspecs/common/android-base-tail.conf')
-rw-r--r-- | mkspecs/common/android-base-tail.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mkspecs/common/android-base-tail.conf b/mkspecs/common/android-base-tail.conf index 464b60b1c4..160caf011f 100644 --- a/mkspecs/common/android-base-tail.conf +++ b/mkspecs/common/android-base-tail.conf @@ -38,8 +38,6 @@ QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden QMAKE_CFLAGS_NEON = -mfpu=neon -QMAKE_CFLAGS_GNUC99 = -std=gnu99 -QMAKE_CFLAGS_GNUC11 = -std=gnu11 QMAKE_CXXFLAGS_CXX11 = -std=c++11 QMAKE_CXXFLAGS_CXX14 = -std=c++14 QMAKE_CXXFLAGS_CXX1Z = -std=c++1z |