Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts: src/plugins/qmljstools/qmlconsoleitemdelegate.cpp src/plugins/qmlprofiler/qmlprofilerengine.cpp Change-Id: I95c2c4116e28683fafcc0a557a7913d67361dcd4
No related branches found
No related tags found
Showing
- share/qtcreator/translations/qtcreator_zh_CN.ts 7 additions, 7 deletionsshare/qtcreator/translations/qtcreator_zh_CN.ts
- share/qtcreator/translations/qtcreator_zh_TW.ts 9 additions, 7309 deletionsshare/qtcreator/translations/qtcreator_zh_TW.ts
- src/plugins/android/androidconfigurations.cpp 3 additions, 0 deletionssrc/plugins/android/androidconfigurations.cpp
- src/plugins/android/androidmanager.cpp 5 additions, 4 deletionssrc/plugins/android/androidmanager.cpp
- src/plugins/projectexplorer/projectexplorer.cpp 2 additions, 0 deletionssrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/projectexplorer/projectexplorersettings.h 2 additions, 1 deletionsrc/plugins/projectexplorer/projectexplorersettings.h
- src/plugins/projectexplorer/projectexplorersettingspage.cpp 3 additions, 1 deletionsrc/plugins/projectexplorer/projectexplorersettingspage.cpp
- src/plugins/projectexplorer/projectexplorersettingspage.h 3 additions, 1 deletionsrc/plugins/projectexplorer/projectexplorersettingspage.h
- src/plugins/qmljstools/qmlconsoleitemdelegate.cpp 4 additions, 0 deletionssrc/plugins/qmljstools/qmlconsoleitemdelegate.cpp
- src/plugins/qmljstools/qmlconsoleview.cpp 10 additions, 2 deletionssrc/plugins/qmljstools/qmlconsoleview.cpp
- src/plugins/qmlprofiler/qmlprofilerengine.cpp 3 additions, 1 deletionsrc/plugins/qmlprofiler/qmlprofilerengine.cpp
Loading
Please register or sign in to comment