diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-06 13:52:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-06 14:16:31 +0200 |
| commit | 0fc569184cf0fb6663e955e68bfa14baf3f3fe0d (patch) | |
| tree | 0161df2f2ac28b554e77d62498647054198d8e1e /configure.json | |
| parent | 280e321e52fd4e86545f3f0d4bd4e047786a897e (diff) | |
| parent | efb84b6189f9e98c6dd29c22f00ad760445196c2 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
src/widgets/widgets/qtabbar.cpp
Change-Id: Iaa9daee5f7a6490d56257a3824730a35751ceb05
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/configure.json b/configure.json index c5be88856d..06c62f5aea 100644 --- a/configure.json +++ b/configure.json @@ -247,11 +247,6 @@ "type": "compile", "test": "common/c++1z" }, - "cxx11default": { - "label": "compiler defaulting to C++11 or higher", - "type": "compile", - "test": "common/c++98default" - }, "precompile_header": { "label": "precompiled header support", "type": "compile", @@ -469,11 +464,6 @@ "condition": "call.crossCompile", "output": [ "publicConfig", "privateConfig", "publicFeature", "crossCompile" ] }, - "cxx11default": { - "label": "Compiler defaults to C++11 or higher", - "condition": "!tests.cxx11default", - "output": [ { "type": "publicConfig", "name": "c++11" } ] - }, "compiler-flags": { "output": [ "compilerFlags" ] }, |