Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts: src/plugins/qmlprofiler/qmlprofilerengine.cpp Change-Id: Ic9dc22d2d4a7306cfc4ef0ec158993e3768a9853
No related branches found
No related tags found
Showing
- doc/api/coding-style.qdoc 0 additions, 1 deletiondoc/api/coding-style.qdoc
- doc/api/external-tool-spec.qdoc 0 additions, 1 deletiondoc/api/external-tool-spec.qdoc
- doc/api/qtcreator-api.qdoc 0 additions, 1 deletiondoc/api/qtcreator-api.qdoc
- doc/api/qtcreator-dev.qdoc 1 addition, 1 deletiondoc/api/qtcreator-dev.qdoc
- doc/api/qtcreator-documentation.qdoc 0 additions, 1 deletiondoc/api/qtcreator-documentation.qdoc
- doc/api/qtcreator-ui-text.qdoc 0 additions, 1 deletiondoc/api/qtcreator-ui-text.qdoc
- src/plugins/android/androidconfigurations.cpp 52 additions, 1 deletionsrc/plugins/android/androidconfigurations.cpp
- src/plugins/android/androidmanager.cpp 5 additions, 0 deletionssrc/plugins/android/androidmanager.cpp
- src/plugins/android/androidpackagecreationstep.cpp 20 additions, 10 deletionssrc/plugins/android/androidpackagecreationstep.cpp
- src/plugins/android/androidpackagecreationstep.h 3 additions, 1 deletionsrc/plugins/android/androidpackagecreationstep.h
- src/plugins/android/androidpackageinstallationstep.cpp 14 additions, 1 deletionsrc/plugins/android/androidpackageinstallationstep.cpp
- src/plugins/android/androidtoolchain.cpp 3 additions, 0 deletionssrc/plugins/android/androidtoolchain.cpp
- src/plugins/plugins.pro 1 addition, 1 deletionsrc/plugins/plugins.pro
- src/plugins/qmlprofiler/localqmlprofilerrunner.cpp 5 additions, 0 deletionssrc/plugins/qmlprofiler/localqmlprofilerrunner.cpp
- src/plugins/qmlprofiler/localqmlprofilerrunner.h 1 addition, 0 deletionssrc/plugins/qmlprofiler/localqmlprofilerrunner.h
- src/plugins/qmlprofiler/qmlprofilerengine.cpp 1 addition, 3 deletionssrc/plugins/qmlprofiler/qmlprofilerengine.cpp
Loading
Please register or sign in to comment