diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-01 16:30:02 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-02 07:52:38 +0000 |
| commit | 45b854dbd56102b7be94cb6b73b7e6a42e81d930 (patch) | |
| tree | 25b7deff9b76d207c11c32725521c05524018c5c | |
| parent | 9611294dd29b5e8bc24068f47d4561ee1e69e5ea (diff) | |
enable c++11 really globally
... and remove all instances that became redundant now.
this excludes everything that comes from outside qtc, or looks like it
could "leave" it.
Change-Id: Idc8baad17cd1ffdc5e160ec48ea3292d633a2562
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | .qmake.conf | 1 | ||||
| -rw-r--r-- | qtcreator.pri | 3 | ||||
| -rw-r--r-- | tests/auto/json/json.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/codemodel/dependencies/dependencies.pro | 2 | ||||
| -rw-r--r-- | tests/manual/debugger/simple/simple_test_app.pro | 2 | ||||
| -rw-r--r-- | tests/unit/echoserver/echoserver.pro | 2 | ||||
| -rw-r--r-- | tests/unit/unittest/unittest.pro | 2 |
7 files changed, 4 insertions, 10 deletions
diff --git a/.qmake.conf b/.qmake.conf new file mode 100644 index 0000000000..a695f3792d --- /dev/null +++ b/.qmake.conf @@ -0,0 +1 @@ +CONFIG += c++11 diff --git a/qtcreator.pri b/qtcreator.pri index 6661242887..cf214e64e1 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -6,9 +6,6 @@ QTCREATOR_COMPAT_VERSION = 4.0.83 VERSION = $$QTCREATOR_VERSION BINARY_ARTIFACTS_BRANCH = 4.1 -# enable c++11 -CONFIG += c++11 - defineReplace(qtLibraryTargetName) { unset(LIBRARY_NAME) LIBRARY_NAME = $$1 diff --git a/tests/auto/json/json.pro b/tests/auto/json/json.pro index c9f7b7d447..b7c5970698 100644 --- a/tests/auto/json/json.pro +++ b/tests/auto/json/json.pro @@ -1,7 +1,7 @@ TARGET = tst_json QT = core testlib CONFIG -= app_bundle -CONFIG += testcase c++11 +CONFIG += testcase TESTDATA += test.json test.bjson test3.json test2.json bom.json diff --git a/tests/auto/qml/codemodel/dependencies/dependencies.pro b/tests/auto/qml/codemodel/dependencies/dependencies.pro index b56dfdbe6d..187539ddf6 100644 --- a/tests/auto/qml/codemodel/dependencies/dependencies.pro +++ b/tests/auto/qml/codemodel/dependencies/dependencies.pro @@ -9,8 +9,6 @@ DEFINES+=TESTSRCDIR=\\\"$$PWD\\\" QT += core QT -= gui -CONFIG += c++11 - TARGET = tst_dependencies CONFIG += console CONFIG -= app_bundle diff --git a/tests/manual/debugger/simple/simple_test_app.pro b/tests/manual/debugger/simple/simple_test_app.pro index 3995f45f08..fa3be4deda 100644 --- a/tests/manual/debugger/simple/simple_test_app.pro +++ b/tests/manual/debugger/simple/simple_test_app.pro @@ -9,8 +9,6 @@ SOURCES += simple_test_app.cpp QT += network xml !isEmpty(QT.script.name): QT += script -CONFIG += c++11 - osx { DEFINES += USE_CXX11 QMAKE_CXXFLAGS += -stdlib=libc++ diff --git a/tests/unit/echoserver/echoserver.pro b/tests/unit/echoserver/echoserver.pro index 7058753f4f..b96de17287 100644 --- a/tests/unit/echoserver/echoserver.pro +++ b/tests/unit/echoserver/echoserver.pro @@ -3,7 +3,7 @@ QT += core network QT -= gui TARGET = echo -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle TEMPLATE = app diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro index 1dfd5b4748..d9ffc81a8c 100644 --- a/tests/unit/unittest/unittest.pro +++ b/tests/unit/unittest/unittest.pro @@ -6,7 +6,7 @@ include(creator_dependency.pri) include(benchmark_dependency.pri) QT += core network testlib widgets -CONFIG += console c++11 testcase object_parallel_to_source +CONFIG += console testcase object_parallel_to_source CONFIG -= app_bundle OBJECTS_DIR = $$OUT_PWD/obj # workaround for qmake bug in object_parallel_to_source |