diff options
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/default_post.prf | 15 | ||||
-rw-r--r-- | mkspecs/features/qt_common.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/qt_configure.prf | 13 |
3 files changed, 2 insertions, 28 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index bf5acdefc4..9eba5bcf00 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -143,21 +143,6 @@ c++11|c++14|c++1z { unset(cxxstd) } -c99|c11 { - c11: cstd = C11 - else: cstd = C99 - - # Check if we should disable compiler extensions or not - !isEmpty(QMAKE_CFLAGS_GNU$$cstd) { - # Let strict C++ imply strict C - !strict_c++: cstd = GNU$$cstd - } - - QMAKE_CFLAGS += $$eval(QMAKE_CFLAGS_$$cstd) - - unset(cstd) -} - utf8_source { QMAKE_CFLAGS += $$QMAKE_CFLAGS_UTF8_SOURCE QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_UTF8_SOURCE diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 40f03d2186..f4ae5bde80 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -17,8 +17,6 @@ DEFINES *= QT_NO_NARROWING_CONVERSIONS_IN_CONNECT qtConfig(c++11): CONFIG += c++11 strict_c++ qtConfig(c++14): CONFIG += c++14 qtConfig(c++1z): CONFIG += c++1z -qtConfig(c99): CONFIG += c99 -qtConfig(c11): CONFIG += c11 qtConfig(stack-protector-strong): CONFIG += stack_protector_strong contains(TEMPLATE, .*lib) { # module and plugins diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index a7da26c745..98fff59ea1 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -866,15 +866,6 @@ defineTest(qtConfTestPrepare_compile) { defineTest(qtConfPrepareCompileTestSource) { test_dir = $$2 - test_lang = $$eval($${1}.lang) - isEmpty(test_lang): test_lang = "c++" - - equals(test_lang, "c++"): suffix = "cpp" - else: equals(test_lang, "c"): suffix = "c" - else: equals(test_lang, "objc"): suffix = "m" - else: equals(test_lang, "objc++"): suffix = "mm" - else: error("Unknown language '$$test_lang' in compile test $$1") - # Create source code contents = "/* Generated by configure */" # Custom code before includes @@ -898,10 +889,10 @@ defineTest(qtConfPrepareCompileTestSource) { " /* END TEST */" \ " return 0;" \ "}" - write_file($$test_dir/main.$$suffix, contents)|error() + write_file($$test_dir/main.cpp, contents)|error() # Create stub .pro file - contents = "SOURCES = main.$$suffix" + contents = "SOURCES = main.cpp" # Custom project code for (ent, $$qtConfScalarOrList($${1}.qmake)): \ contents += $$ent |