diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-04-20 14:58:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-04-20 14:58:48 +0200 |
| commit | ee8bf341c6f64096c6ccfeefd3b6b8a85fe91c0b (patch) | |
| tree | 4dd8b097d0d2acc17f1a13e0e99debfc92b36466 /tests/unit/unittest | |
| parent | 0eeee15a887a8180c1c28dc9f4929b066e096136 (diff) | |
| parent | 5dc690f234ec7bb5dcdb11a610a4ecbee6dc4d64 (diff) | |
| download | qt-creator-ee8bf341c6f64096c6ccfeefd3b6b8a85fe91c0b.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/projectexplorer/session.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f
Diffstat (limited to 'tests/unit/unittest')
| -rw-r--r-- | tests/unit/unittest/gmock_dependency.pri | 2 | ||||
| -rw-r--r-- | tests/unit/unittest/unittest.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/unittest/gmock_dependency.pri b/tests/unit/unittest/gmock_dependency.pri index 0dbd28acbe..a78f11b6a8 100644 --- a/tests/unit/unittest/gmock_dependency.pri +++ b/tests/unit/unittest/gmock_dependency.pri @@ -29,7 +29,7 @@ isEmpty(GOOGLETEST_DIR) { } requires(exists($$GTEST_SRC_DIR):exists($$GMOCK_SRC_DIR)) -!exists($$GTEST_SRC_DIR):message("No gmock is found! To enabe unit tests set GOOGLETEST_DIR") +!exists($$GTEST_SRC_DIR):message("No gmock is found! To enable unit tests set GOOGLETEST_DIR") DEFINES += \ GTEST_HAS_STD_INITIALIZER_LIST_ \ diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro index c53cc35172..30d075079b 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++14 testcase object_parallel_to_source +CONFIG += console c++11 testcase object_parallel_to_source CONFIG -= app_bundle OBJECTS_DIR = $$OUT_PWD/obj # workaround for qmake bug in object_parallel_to_source |