diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-05-03 11:49:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-05-03 11:49:01 +0200 |
| commit | 0f94aa3f4d8c38d0fb247f2e56b4153b03bc43b9 (patch) | |
| tree | 092bf6aab0688c0cae20e0d355cc7d75fd614378 /tests/manual | |
| parent | 5fa52d2ff9a93110cff38cf43c16268515fed937 (diff) | |
| parent | 9b69b789ab8a7ccc0f7c251f364f232f2a41c7fd (diff) | |
| download | qt-creator-0f94aa3f4d8c38d0fb247f2e56b4153b03bc43b9.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/debugger/debuggerruncontrol.cpp
src/plugins/projectexplorer/projectwizardpage.cpp
src/plugins/projectexplorer/xcodebuildparser.h
src/plugins/qmldesigner/qmldesignerplugin.cpp
src/tools/clangbackend/ipcsource/translationunits.cpp
Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/debugger/simple/simple_test_app.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/debugger/simple/simple_test_app.pro b/tests/manual/debugger/simple/simple_test_app.pro index f7b492ef79..3995f45f08 100644 --- a/tests/manual/debugger/simple/simple_test_app.pro +++ b/tests/manual/debugger/simple/simple_test_app.pro @@ -64,7 +64,7 @@ exists(/usr/local/include/eigen3/Eigen/Core) { INCLUDEPATH += /usr/local/include/eigen3 } -win32-msvc*:DEFINES += _CRT_SECURE_NO_WARNINGS +msvc: DEFINES += _CRT_SECURE_NO_WARNINGS # Use for semi-automated testing #DEFINES += USE_AUTORUN=1 |