From 955cf40b18ba37c46d692206c5fc39e93bfda01c Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 9 Feb 2018 15:38:27 +0100 Subject: Testlib: Add a feature for the item model tester It depends on QAbstractItemModel, so we need to switch it off if itemmodel is unavailable. Change-Id: I97246767a5e387b7a2cee90c34125a8411ef1c4e Reviewed-by: Oswald Buddenhagen --- configure.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.json') diff --git a/configure.json b/configure.json index 003c6c5b90..ae2aa22070 100644 --- a/configure.json +++ b/configure.json @@ -14,7 +14,8 @@ "src/xml", "src/widgets", "src/printsupport", - "src/plugins/sqldrivers" + "src/plugins/sqldrivers", + "src/testlib" ], "commandline": { -- cgit v1.2.3 From a47cb146809e32f43449dcfe9932833c2f0ab987 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 14 Feb 2018 13:40:57 +0100 Subject: Detect C standard and try using the most recent Fixes the default C version used with gcc < 5 Change-Id: I948dece961caed8e6b181e1c6e6b9dc43c46583f Reviewed-by: Oswald Buddenhagen --- configure.json | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'configure.json') diff --git a/configure.json b/configure.json index ae2aa22070..b4d763116c 100644 --- a/configure.json +++ b/configure.json @@ -259,6 +259,36 @@ "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", @@ -786,6 +816,19 @@ "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", @@ -1246,6 +1289,11 @@ 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 From dbc983a513a6dff9973490d013b144812ec707aa Mon Sep 17 00:00:00 2001 From: Friedemann Kleint 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 Reviewed-by: Liang Qi Reviewed-by: Gatis Paeglis --- 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