Merge remote-tracking branch 'origin/2.6'
Conflicts: qtcreator.pri qtcreator.qbs src/plugins/fakevim/fakevimhandler.cpp src/plugins/qtsupport/baseqtversion.cpp tests/auto/cplusplus/cxx11/cxx11.pro tests/auto/cplusplus/cxx11/tst_cxx11.cpp tests/auto/icheckbuild/icheckbuild.pro Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
Showing
- doc/src/projects/creator-projects-creating.qdoc 2 additions, 1 deletiondoc/src/projects/creator-projects-creating.qdoc
- qtcreator.pri 0 additions, 4 deletionsqtcreator.pri
- share/qtcreator/translations/qtcreator_pl.ts 14 additions, 16 deletionsshare/qtcreator/translations/qtcreator_pl.ts
- src/libs/cplusplus/LookupContext.h 1 addition, 1 deletionsrc/libs/cplusplus/LookupContext.h
- src/plugins/autotoolsprojectmanager/makefileparser.cpp 4 additions, 1 deletionsrc/plugins/autotoolsprojectmanager/makefileparser.cpp
- src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp 2 additions, 3 deletionssrc/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
- src/plugins/debugger/cdb/cdbengine.cpp 3 additions, 1 deletionsrc/plugins/debugger/cdb/cdbengine.cpp
- src/plugins/debugger/debuggerplugin.cpp 1 addition, 0 deletionssrc/plugins/debugger/debuggerplugin.cpp
- src/plugins/debugger/qml/qmlengine.cpp 7 additions, 3 deletionssrc/plugins/debugger/qml/qmlengine.cpp
- src/plugins/git/gitclient.cpp 4 additions, 4 deletionssrc/plugins/git/gitclient.cpp
- src/plugins/qmldesigner/components/pluginmanager/iplugin.h 1 addition, 1 deletionsrc/plugins/qmldesigner/components/pluginmanager/iplugin.h
- src/plugins/qmldesigner/designercore/include/iwidgetplugin.h 1 addition, 1 deletionsrc/plugins/qmldesigner/designercore/include/iwidgetplugin.h
- src/plugins/qtsupport/baseqtversion.cpp 56 additions, 44 deletionssrc/plugins/qtsupport/baseqtversion.cpp
- src/shared/proparser/profileevaluator.cpp 1 addition, 1 deletionsrc/shared/proparser/profileevaluator.cpp
- src/shared/proparser/qmakeevaluator.cpp 23 additions, 10 deletionssrc/shared/proparser/qmakeevaluator.cpp
- src/shared/proparser/qmakeevaluator.h 0 additions, 1 deletionsrc/shared/proparser/qmakeevaluator.h
- src/shared/proparser/qmakeglobals.cpp 1 addition, 2 deletionssrc/shared/proparser/qmakeglobals.cpp
- src/tools/gen-cpp-ast/generate-ast.cpp 14 additions, 12 deletionssrc/tools/gen-cpp-ast/generate-ast.cpp
- tests/auto/cplusplus/cxx11/cxx11.pro 2 additions, 1 deletiontests/auto/cplusplus/cxx11/cxx11.pro
- tests/auto/cplusplus/cxx11/tst_cxx11.cpp 2 additions, 1 deletiontests/auto/cplusplus/cxx11/tst_cxx11.cpp
Loading
Please register or sign in to comment