OSDN Git Service

Merge branch '2.3'
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 25 Jul 2011 11:57:13 +0000 (13:57 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 25 Jul 2011 11:57:13 +0000 (13:57 +0200)
commitae8ac2eb2f118cfb96efec7a40aa8d55be2704ee
treefd36ac3e15c7c243d890d5e91544af5307f8c9fc
parent76a5b1953ca230d813340a9d536d636aacd0929b
parent899cc0300336a51f0d553c10d0769b145f99af00
Merge branch '2.3'

Conflicts:
qtcreator.pri
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
src/plugins/remotelinux/maemodeploystepfactory.cpp
src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
23 files changed:
doc/qtcreator.qdoc
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
src/plugins/debugger/debuggerplugin.cpp
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/debugger/qml/qmlengine.h
src/plugins/debugger/watchhandler.cpp
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
src/plugins/qmldesigner/designmodewidget.h
src/plugins/qmljseditor/quicktoolbar.cpp
src/plugins/qmlprofiler/localqmlprofilerrunner.h
src/plugins/qmlprojectmanager/qmlproject.cpp
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
src/plugins/qt4projectmanager/qt4project.cpp
src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
src/plugins/qtsupport/debugginghelperbuildtask.h
src/plugins/qtsupport/qmldumptool.cpp
src/plugins/qtsupport/qtoptionspage.h
src/plugins/remotelinux/genericdirectuploadservice.cpp
src/plugins/remotelinux/maemodeploystepfactory.cpp
src/plugins/texteditor/generichighlighter/manager.h