Merge remote-tracking branch 'origin/3.2'
Conflicts: src/plugins/projectexplorer/projectexplorer.cpp Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
No related branches found
No related tags found
Showing
- share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp 1 addition, 0 deletions.../qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
- src/libs/qmljs/qmljscodeformatter.h 1 addition, 0 deletionssrc/libs/qmljs/qmljscodeformatter.h
- src/libs/utils/tooltip/tipcontents.h 1 addition, 0 deletionssrc/libs/utils/tooltip/tipcontents.h
- src/plugins/coreplugin/modemanager.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/modemanager.cpp
- src/plugins/coreplugin/modemanager.h 1 addition, 1 deletionsrc/plugins/coreplugin/modemanager.h
- src/plugins/genericprojectmanager/genericproject.cpp 2 additions, 2 deletionssrc/plugins/genericprojectmanager/genericproject.cpp
- src/plugins/perforce/perforceplugin.cpp 30 additions, 14 deletionssrc/plugins/perforce/perforceplugin.cpp
- src/plugins/projectexplorer/projectexplorer.cpp 4 additions, 3 deletionssrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/texteditor/texteditor.cpp 2 additions, 1 deletionsrc/plugins/texteditor/texteditor.cpp
- src/shared/qtsingleapplication/qtlocalpeer.cpp 1 addition, 0 deletionssrc/shared/qtsingleapplication/qtlocalpeer.cpp
- src/tools/3rdparty/iossim/iphonesimulator.mm 13 additions, 4 deletionssrc/tools/3rdparty/iossim/iphonesimulator.mm
- tests/system/objects.map 3 additions, 0 deletionstests/system/objects.map
- tests/system/shared/clang.py 79 additions, 0 deletionstests/system/shared/clang.py
- tests/system/shared/qtcreator.py 2 additions, 1 deletiontests/system/shared/qtcreator.py
- tests/system/suite_CSUP/tst_CSUP03/test.py 39 additions, 32 deletionstests/system/suite_CSUP/tst_CSUP03/test.py
- tests/system/suite_CSUP/tst_CSUP04/test.py 36 additions, 32 deletionstests/system/suite_CSUP/tst_CSUP04/test.py
- tests/system/suite_CSUP/tst_CSUP05/test.py 53 additions, 48 deletionstests/system/suite_CSUP/tst_CSUP05/test.py
- tests/system/suite_CSUP/tst_CSUP06/test.py 10 additions, 42 deletionstests/system/suite_CSUP/tst_CSUP06/test.py
- tests/system/suite_debugger/tst_simple_debug/test.py 4 additions, 0 deletionstests/system/suite_debugger/tst_simple_debug/test.py
- tests/system/suite_editors/tst_memberoperator/test.py 29 additions, 17 deletionstests/system/suite_editors/tst_memberoperator/test.py
Loading
Please register or sign in to comment