Merge remote-tracking branch 'origin/2.7'
Showing
- share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri 1 addition, 1 deletionshare/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
- share/qtcreator/snippets/cpp.xml 1 addition, 1 deletionshare/qtcreator/snippets/cpp.xml
- share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml 3 additions, 1 deletion...qtcreator/templates/wizards/qtquick1-extension/wizard.xml
- share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml 3 additions, 1 deletion...qtcreator/templates/wizards/qtquick2-extension/wizard.xml
- src/plugins/debugger/debuggerkitinformation.cpp 2 additions, 0 deletionssrc/plugins/debugger/debuggerkitinformation.cpp
- src/plugins/plugins.pro 1 addition, 1 deletionsrc/plugins/plugins.pro
- src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp 1 addition, 0 deletions...ins/qmldesigner/components/formeditor/formeditorscene.cpp
- src/plugins/qmldesigner/components/formeditor/formeditorview.cpp 4 additions, 0 deletions...gins/qmldesigner/components/formeditor/formeditorview.cpp
- tests/manual/debugger/simple/simple_test_app.pro 1 addition, 1 deletiontests/manual/debugger/simple/simple_test_app.pro
- tests/system/README 5 additions, 2 deletionstests/system/README
- tests/system/settings/unix/QtProject/qtcreator/profiles.xml 34 additions, 4 deletionstests/system/settings/unix/QtProject/qtcreator/profiles.xml
- tests/system/settings/unix/QtProject/qtcreator/qtversion.xml 10 additions, 0 deletionstests/system/settings/unix/QtProject/qtcreator/qtversion.xml
- tests/system/settings/unix/QtProject/qtcreator/toolchains.xml 1 addition, 0 deletions...s/system/settings/unix/QtProject/qtcreator/toolchains.xml
- tests/system/settings/windows/QtProject/qtcreator/profiles.xml 38 additions, 5 deletions.../system/settings/windows/QtProject/qtcreator/profiles.xml
- tests/system/settings/windows/QtProject/qtcreator/qtversion.xml 31 additions, 21 deletions...system/settings/windows/QtProject/qtcreator/qtversion.xml
- tests/system/settings/windows/QtProject/qtcreator/toolchains.xml 13 additions, 2 deletions...ystem/settings/windows/QtProject/qtcreator/toolchains.xml
- tests/system/shared/classes.py 3 additions, 0 deletionstests/system/shared/classes.py
- tests/system/shared/hook_utils.py 12 additions, 9 deletionstests/system/shared/hook_utils.py
- tests/system/shared/project.py 5 additions, 3 deletionstests/system/shared/project.py
- tests/system/shared/project_explorer.py 1 addition, 1 deletiontests/system/shared/project_explorer.py
Loading
Please register or sign in to comment