OSDN Git Service

Merge remote-tracking branch 'origin/2.3'
authorEike Ziller <eike.ziller@nokia.com>
Thu, 15 Sep 2011 09:50:29 +0000 (11:50 +0200)
committerEike Ziller <eike.ziller@nokia.com>
Thu, 15 Sep 2011 09:50:29 +0000 (11:50 +0200)
commitb0efd44d20e9129c40b47ad3715c248962a947b9
tree4415eccb62e5fca5bf1f83d19f1cdaad6ca339e7
parent8801c76a8e223b6f41a8369e75c71b67237d8d25
parent33cd873d56f948b4805da31adaf436618ac7edac
Merge remote-tracking branch 'origin/2.3'

Conflicts:
qtcreator.pri
qtcreator.pro
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
16 files changed:
doc/qtcreator.qdoc
qtcreator.pro
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
src/plugins/bineditor/bineditor.cpp
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
src/plugins/qt4projectmanager/qmakestep.cpp
src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
src/plugins/remotelinux/qt4maemotarget.cpp
src/plugins/remotelinux/remotelinuxruncontrol.cpp