OSDN Git Service

Merge remote-tracking branch 'origin/2.3'
authorEike Ziller <eike.ziller@nokia.com>
Tue, 30 Aug 2011 13:59:07 +0000 (15:59 +0200)
committerEike Ziller <eike.ziller@nokia.com>
Tue, 30 Aug 2011 13:59:07 +0000 (15:59 +0200)
commit57ae91c5efd856832ffb913af3aa4ba28ae1d787
tree081f38620739883901125a89182715356abbbf84
parent90a7786ddedc1c417895cc1a9b7c866afd59730b
parentbc7abeb6021c1705fbd94ea5362f16a1c3325835
Merge remote-tracking branch 'origin/2.3'

Conflicts:
doc/qtcreator.qdoc
qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
doc/config/qt-html-templates-online.qdocconf
doc/qtcreator-faq.qdoc
doc/qtcreator.qdoc
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
src/plugins/debugger/cdb/cdbengine.cpp
src/plugins/debugger/qml/qmlcppengine.cpp
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/qmlprofiler/qmlprofilertool.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qtsupport/debugginghelperbuildtask.cpp