Merge remote-tracking branch 'upstream/tags/v2.3.1' into 2.3-necessitas
authorBogDan Vatra <bog_dan_ro@yahoo.com>
Fri, 7 Oct 2011 07:41:02 +0000 (10:41 +0300)
committerBogDan Vatra <bog_dan_ro@yahoo.com>
Fri, 7 Oct 2011 07:41:02 +0000 (10:41 +0300)
commite856c7eba8f5e6845267906d9536648c8e839033
treeea8f82cb4b23016fef2b20e03fe402f277413e9f
parent89e4eb50f405da9ec09a9d1692f8d52513f36202
parent8840168fc568b88a7beb8fd83075a5e45174642d
Merge remote-tracking branch 'upstream/tags/v2.3.1' into 2.3-necessitas
qtcreator.pri
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
src/plugins/plugins.pro
src/plugins/qt4projectmanager/qmakestep.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp