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

Revert required C++ version to 11

Browse Source 
It was bumped to 14 in merge commit 1853f01a, due to a conflict in
unittest.pro which I confused with qtcreator.pri.

Change-Id: I1ec15d9d20d90c38849eea799a724f4c85fe36b5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2016-08-12 16:44:39 +03:00
committed by Orgad Shaneh
parent 7eacb25ded
commit c9956b9e05
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.qmake.conf
View File

@@ -1 +1 @@
CONFIG += c++14 CONFIG += c++11

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 testcase object_parallel_to_source CONFIG += console c++14 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