feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

enable c++11 really globally

Browse Source 
... 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>
This commit is contained in:
Oswald Buddenhagen
2016-08-01 16:30:02 +02:00
parent 9611294dd2
commit 45b854dbd5
7 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.qmake.conf Normal file
View File

@@ -0,0 +1 @@
CONFIG += c++11

3
qtcreator.pri
View File

@@ -6,9 +6,6 @@ QTCREATOR_COMPAT_VERSION = 4.0.83
VERSION = $$QTCREATOR_VERSION VERSION = $$QTCREATOR_VERSION
BINARY_ARTIFACTS_BRANCH = 4.1 BINARY_ARTIFACTS_BRANCH = 4.1
# enable c++11
CONFIG += c++11
defineReplace(qtLibraryTargetName) { defineReplace(qtLibraryTargetName) {
unset(LIBRARY_NAME) unset(LIBRARY_NAME)
LIBRARY_NAME = $$1 LIBRARY_NAME = $$1

2
tests/auto/json/json.pro
View File

@@ -1,7 +1,7 @@
TARGET = tst_json TARGET = tst_json
QT = core testlib QT = core testlib
CONFIG -= app_bundle CONFIG -= app_bundle
CONFIG += testcase c++11 CONFIG += testcase
TESTDATA += test.json test.bjson test3.json test2.json bom.json TESTDATA += test.json test.bjson test3.json test2.json bom.json

2
tests/auto/qml/codemodel/dependencies/dependencies.pro
View File

@@ -9,8 +9,6 @@ DEFINES+=TESTSRCDIR=\\\"$$PWD\\\"
QT += core QT += core
QT -= gui QT -= gui
CONFIG += c++11
TARGET = tst_dependencies TARGET = tst_dependencies
CONFIG += console CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle

2
tests/manual/debugger/simple/simple_test_app.pro
View File

@@ -9,8 +9,6 @@ SOURCES += simple_test_app.cpp
QT += network xml QT += network xml
!isEmpty(QT.script.name): QT += script !isEmpty(QT.script.name): QT += script
CONFIG += c++11
osx { osx {
DEFINES += USE_CXX11 DEFINES += USE_CXX11
QMAKE_CXXFLAGS += -stdlib=libc++ QMAKE_CXXFLAGS += -stdlib=libc++

2
tests/unit/echoserver/echoserver.pro
View File

@@ -3,7 +3,7 @@ QT += core network
QT -= gui QT -= gui
TARGET = echo TARGET = echo
CONFIG += console c++11 CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle
TEMPLATE = app TEMPLATE = app

2
tests/unit/unittest/unittest.pro
View File

@@ -6,7 +6,7 @@ include(creator_dependency.pri)
include(benchmark_dependency.pri) include(benchmark_dependency.pri)
QT += core network testlib widgets QT += core network testlib widgets
CONFIG += console c++11 testcase object_parallel_to_source CONFIG += console testcase object_parallel_to_source
CONFIG -= app_bundle CONFIG -= app_bundle
OBJECTS_DIR = $$OUT_PWD/obj # workaround for qmake bug in object_parallel_to_source OBJECTS_DIR = $$OUT_PWD/obj # workaround for qmake bug in object_parallel_to_source