Merge remote branch 'origin/2.2'
Conflicts: src/plugins/debugger/gdb/gdbengine.cpp src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
Showing
- dist/changes-2.2.0 6 additions, 1 deletiondist/changes-2.2.0
- doc/images/qmldesigner-preview-size.png 0 additions, 0 deletionsdoc/images/qmldesigner-preview-size.png
- doc/images/qmldesigner-visual-editor.png 0 additions, 0 deletionsdoc/images/qmldesigner-visual-editor.png
- doc/qtcreator.qdoc 32 additions, 2 deletionsdoc/qtcreator.qdoc
- share/qtcreator/qml/qmldump/Info.plist.in 5 additions, 5 deletionsshare/qtcreator/qml/qmldump/Info.plist.in
- share/qtcreator/qml/qmlobserver/Info.plist.in 16 additions, 3 deletionsshare/qtcreator/qml/qmlobserver/Info.plist.in
- share/qtcreator/qml/qmlobserver/qmlobserver.pro 2 additions, 1 deletionshare/qtcreator/qml/qmlobserver/qmlobserver.pro
- share/qtcreator/static.pro 52 additions, 29 deletionsshare/qtcreator/static.pro
- share/qtcreator/templates/shared/app.desktop 1 addition, 1 deletionshare/qtcreator/templates/shared/app.desktop
- share/qtcreator/templates/shared/deployment.pri 10 additions, 3 deletionsshare/qtcreator/templates/shared/deployment.pri
- share/qtcreator/templates/wizards/qml-extension/project.pro 1 addition, 1 deletionshare/qtcreator/templates/wizards/qml-extension/project.pro
- src/app/main.cpp 6 additions, 3 deletionssrc/app/main.cpp
- src/libs/extensionsystem/plugindetailsview.ui 67 additions, 5 deletionssrc/libs/extensionsystem/plugindetailsview.ui
- src/libs/qtcreatorcdbext/containers.cpp 2 additions, 1 deletionsrc/libs/qtcreatorcdbext/containers.cpp
- src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp 4 additions, 2 deletionssrc/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp
- src/libs/qtcreatorcdbext/symbolgroupvalue.cpp 25 additions, 0 deletionssrc/libs/qtcreatorcdbext/symbolgroupvalue.cpp
- src/libs/qtcreatorcdbext/symbolgroupvalue.h 3 additions, 0 deletionssrc/libs/qtcreatorcdbext/symbolgroupvalue.h
- src/libs/utils/consoleprocess.cpp 5 additions, 0 deletionssrc/libs/utils/consoleprocess.cpp
- src/libs/utils/consoleprocess.h 1 addition, 0 deletionssrc/libs/utils/consoleprocess.h
- src/libs/utils/consoleprocess_unix.cpp 10 additions, 3 deletionssrc/libs/utils/consoleprocess_unix.cpp
Loading
Please register or sign in to comment