Merge remote branch 'origin/2.1'
Conflicts: share/qtcreator/templates/qmlapp/app.pro src/plugins/plugins.pro src/plugins/qt4projectmanager/qt4project.h src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
Showing
- scripts/createSrcAndDocPackage.sh 8 additions, 8 deletionsscripts/createSrcAndDocPackage.sh
- share/qtcreator/gdbmacros/dumper.py 6 additions, 3 deletionsshare/qtcreator/gdbmacros/dumper.py
- share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h 4 additions, 0 deletions...jsdebugger/include/qt_private/qdeclarativedebughelper_p.h
- share/qtcreator/qml/qmlobserver/main.cpp 4 additions, 0 deletionsshare/qtcreator/qml/qmlobserver/main.cpp
- share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml 2 additions, 2 deletionsshare/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml
- share/qtcreator/templates/qmlapp/app.pro 1 addition, 1 deletionshare/qtcreator/templates/qmlapp/app.pro
- share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp 20 additions, 0 deletions...ates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
- share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri 6 additions, 6 deletions...ates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
- src/libs/qmleditorwidgets/contextpanetext.ui 31 additions, 7 deletionssrc/libs/qmleditorwidgets/contextpanetext.ui
- src/libs/qmleditorwidgets/contextpanewidget.cpp 17 additions, 0 deletionssrc/libs/qmleditorwidgets/contextpanewidget.cpp
- src/libs/qmleditorwidgets/contextpanewidget.h 2 additions, 0 deletionssrc/libs/qmleditorwidgets/contextpanewidget.h
- src/libs/qmleditorwidgets/customcolordialog.cpp 15 additions, 0 deletionssrc/libs/qmleditorwidgets/customcolordialog.cpp
- src/libs/qmleditorwidgets/customcolordialog.h 2 additions, 0 deletionssrc/libs/qmleditorwidgets/customcolordialog.h
- src/plugins/debugger/gdb/symbian.cpp 2 additions, 1 deletionsrc/plugins/debugger/gdb/symbian.cpp
- src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp 10 additions, 2 deletions...s/qmldesigner/components/navigator/navigatortreemodel.cpp
- src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp 10 additions, 2 deletions.../qmldesigner/components/propertyeditor/propertyeditor.cpp
- src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp 21 additions, 5 deletions...igner/components/propertyeditor/qmlanchorbindingproxy.cpp
- src/plugins/qt4projectmanager/qt4nodes.cpp 1 addition, 0 deletionssrc/plugins/qt4projectmanager/qt4nodes.cpp
- src/plugins/qt4projectmanager/qt4project.h 3 additions, 1 deletionsrc/plugins/qt4projectmanager/qt4project.h
- src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri 1 addition, 1 deletion...gins/qt4projectmanager/qt4projectmanager_dependencies.pri
Loading
Please register or sign in to comment