From dbc983a513a6dff9973490d013b144812ec707aa Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 26 Mar 2018 12:58:23 +0200
Subject: 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>
---
 configure.json | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index b4d763116c..ae2aa22070 100644
--- a/configure.json
+++ b/configure.json
@@ -259,36 +259,6 @@
             "type": "compile",
             "test": "stl"
         },
-        "c99": {
-            "label": "C99 support",
-            "type": "compile",
-            "test": {
-                "head": [
-                    "#if __STDC_VERSION__ >= 199901L",
-                    "// Compiler claims to support C99, trust it",
-                    "#else",
-                    "#  error __STDC_VERSION__ must be >= 199901L",
-                    "#endif"
-                ],
-                "lang": "c",
-                "qmake": "CONFIG += c99"
-            }
-        },
-        "c11": {
-            "label": "C11 support",
-            "type": "compile",
-            "test": {
-                "head": [
-                    "#if __STDC_VERSION__ >= 201112L",
-                    "// Compiler claims to support C11, trust it",
-                    "#else",
-                    "#  error __STDC_VERSION__ must be >= 201112L",
-                    "#endif"
-                ],
-                "lang": "c",
-                "qmake": "CONFIG += c11"
-            }
-        },
         "c++14": {
             "label": "C++14 support",
             "type": "compile",
@@ -816,19 +786,6 @@
             "condition": "features.c++14 && tests.c++1z",
             "output": [ "publicFeature", "publicQtConfig" ]
         },
-        "c89": {
-            "label": "C89"
-        },
-        "c99": {
-            "label": "C99",
-            "condition": "tests.c99",
-            "output": [ "publicFeature" ]
-        },
-        "c11": {
-            "label": "C11",
-            "condition": "features.c99 && tests.c11",
-            "output": [ "publicFeature" ]
-        },
         "precompile_header": {
             "label": "Using precompiled headers",
             "condition": "config.msvc || tests.precompile_header",
@@ -1289,11 +1246,6 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
                     "condition": "!features.debug || features.debug_and_release"
                 },
                 "shared",
-                {
-                    "message": "Using C standard",
-                    "type": "firstAvailableFeature",
-                    "args": "c11 c99 c89"
-                },
                 {
                     "message": "Using C++ standard",
                     "type": "firstAvailableFeature",
-- 
cgit v1.2.3