Merge remote-tracking branch 'origin/3.1'
Conflicts: qtcreator.pri qtcreator.qbs src/plugins/cpptools/cppcompletion_test.cpp Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521
Showing
- doc/images/qml-profiler-javascript.png 0 additions, 0 deletionsdoc/images/qml-profiler-javascript.png
- doc/images/qtcreator-qml-performance-monitor.png 0 additions, 0 deletionsdoc/images/qtcreator-qml-performance-monitor.png
- doc/src/analyze/qtquick-profiler.qdoc 32 additions, 14 deletionsdoc/src/analyze/qtquick-profiler.qdoc
- share/qtcreator/debugger/dumper.py 18 additions, 16 deletionsshare/qtcreator/debugger/dumper.py
- share/qtcreator/debugger/gdbbridge.py 1 addition, 9 deletionsshare/qtcreator/debugger/gdbbridge.py
- share/qtcreator/debugger/lldbbridge.py 16 additions, 16 deletionsshare/qtcreator/debugger/lldbbridge.py
- share/qtcreator/debugger/qttypes.py 31 additions, 9 deletionsshare/qtcreator/debugger/qttypes.py
- share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml 1 addition, 1 deletion...er/propertyEditorQmlSources/HelperWidgets/ColorEditor.qml
- share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml 1 addition, 1 deletion...igner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml
- src/libs/cplusplus/LookupContext.cpp 1 addition, 0 deletionssrc/libs/cplusplus/LookupContext.cpp
- src/libs/qmldebug/qmlprofilertraceclient.cpp 1 addition, 1 deletionsrc/libs/qmldebug/qmlprofilertraceclient.cpp
- src/libs/qmldebug/qmlprofilertraceclient.h 1 addition, 1 deletionsrc/libs/qmldebug/qmlprofilertraceclient.h
- src/libs/utils/winutils.cpp 18 additions, 0 deletionssrc/libs/utils/winutils.cpp
- src/libs/utils/winutils.h 17 additions, 0 deletionssrc/libs/utils/winutils.h
- src/plugins/android/androiddeployqtstep.cpp 1 addition, 1 deletionsrc/plugins/android/androiddeployqtstep.cpp
- src/plugins/android/androidmanifesteditorwidget.cpp 1 addition, 1 deletionsrc/plugins/android/androidmanifesteditorwidget.cpp
- src/plugins/android/androidpackagecreationstep.cpp 1 addition, 1 deletionsrc/plugins/android/androidpackagecreationstep.cpp
- src/plugins/android/androidqtversion.cpp 7 additions, 0 deletionssrc/plugins/android/androidqtversion.cpp
- src/plugins/android/androidqtversion.h 1 addition, 0 deletionssrc/plugins/android/androidqtversion.h
- src/plugins/coreplugin/actionmanager/actionmanager.cpp 9 additions, 3 deletionssrc/plugins/coreplugin/actionmanager/actionmanager.cpp
Loading
Please register or sign in to comment