con 519b544f62 Merge remote branch 'origin/2.1' ...

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp

2010-12-08 10:57:21 +01:00

..

qml/app

QmlWizards: Use 'QtQuick 1.0' namespace

2010-12-07 11:27:30 +01:00

qmlapplicationviewer

Revert "QmlApp template: Use new 4.7.1 API to enable qml debugging"

2010-11-10 16:56:39 +01:00

app.pro

Merge remote branch 'origin/2.1'

2010-11-04 19:18:45 +01:00

main.cpp

Revert "QmlApp template: Use new 4.7.1 API to enable qml debugging"

2010-11-10 16:56:39 +01:00