Merge remote branch 'origin/2.0'
Conflicts: src/plugins/projectexplorer/miniprojecttargetselector.cpp src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h tests/manual/gdbdebugger/simple/app.cpp
No related branches found
No related tags found
Showing
- doc/doc.pri 2 additions, 2 deletionsdoc/doc.pri
- qtcreator.pro 1 addition, 1 deletionqtcreator.pro
- share/qtcreator/gdbmacros/dumper.py 2 additions, 1 deletionshare/qtcreator/gdbmacros/dumper.py
- share/qtcreator/translations/qtcreator_de.ts 2 additions, 2 deletionsshare/qtcreator/translations/qtcreator_de.ts
- share/qtcreator/translations/qtcreator_pl.ts 48 additions, 2867 deletionsshare/qtcreator/translations/qtcreator_pl.ts
- share/qtcreator/translations/translations.pro 13 additions, 17 deletionsshare/qtcreator/translations/translations.pro
- src/plugins/debugger/gdb/pythongdbengine.cpp 2 additions, 0 deletionssrc/plugins/debugger/gdb/pythongdbengine.cpp
- src/plugins/projectexplorer/miniprojecttargetselector.cpp 30 additions, 7 deletionssrc/plugins/projectexplorer/miniprojecttargetselector.cpp
- src/plugins/projectexplorer/taskwindow.cpp 28 additions, 23 deletionssrc/plugins/projectexplorer/taskwindow.cpp
- src/plugins/projectexplorer/taskwindow.h 2 additions, 3 deletionssrc/plugins/projectexplorer/taskwindow.h
- src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp 38 additions, 21 deletions...designer/components/formeditor/formeditorgraphicsview.cpp
- src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.h 1 addition, 0 deletions...mldesigner/components/formeditor/formeditorgraphicsview.h
- src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp 1 addition, 1 deletion...s/qmldesigner/components/navigator/navigatortreemodel.cpp
- src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp 53 additions, 13 deletions...igner/components/propertyeditor/qmlanchorbindingproxy.cpp
- src/plugins/qmldesigner/designercore/include/qmlanchors.h 1 addition, 0 deletionssrc/plugins/qmldesigner/designercore/include/qmlanchors.h
- src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp 25 additions, 9 deletions...gins/qmldesigner/designercore/model/modeltotextmerger.cpp
- src/plugins/qmldesigner/designercore/model/modeltotextmerger.h 1 addition, 1 deletion...lugins/qmldesigner/designercore/model/modeltotextmerger.h
- src/plugins/qmldesigner/designercore/model/qmlanchors.cpp 49 additions, 1 deletionsrc/plugins/qmldesigner/designercore/model/qmlanchors.cpp
- src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp 64 additions, 36 deletions...mldesigner/designercore/model/rewriteactioncompressor.cpp
- src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h 0 additions, 2 deletions.../qmldesigner/designercore/model/rewriteactioncompressor.h
Loading
Please register or sign in to comment