Eike Ziller b0efd44d20 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

2011-09-15 11:50:29 +02:00

..

html5app

Wizards: Use showFullScreen for Simulator builds.

2011-07-12 12:09:10 +02:00

mobileapp

Wizards: Use showFullScreen for Simulator builds.

2011-07-12 12:09:10 +02:00

qt4project

Fix indention of code generated for mobile gui apps

2010-04-15 17:24:51 +02:00

qtquickapp

Merge remote-tracking branch 'origin/2.3'

2011-09-15 11:50:29 +02:00

shared

MobileWizards: Rename MaemoPngIcon to just PngIcon

2011-08-26 12:47:22 +02:00

wizards

QmlExtension wizard: Use $$[QT_INSTALL_IMPORTS] for desktop targets

2011-07-20 13:15:57 +02:00