Oswald Buddenhagen dd45277a19 Merge remote branch 'origin/2.1' ...

Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/plugins.pro
	src/plugins/qt4projectmanager/qt4project.h
	src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri

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

..

qt_private

QmlApp template: Use new 4.7.1 API to enable qml debugging

2010-11-03 14:06:44 +01:00

jsdebuggeragent.h

debugger: pimpl JSDebuggerAgent

2010-10-27 18:44:25 +02:00

qdeclarativeobserverservice.h

QmlObserver: Prevent messages from being sent if there is no server side

2010-10-01 13:43:41 +02:00

qdeclarativeviewobserver.h

QmlJSDebugger: Remove reference to JSDebugger in QDeclarativeViewObserver

2010-10-13 16:52:58 +02:00

qmljsdebugger_global.h

QmlJSDebugger: Fix linkage error

2010-10-05 16:58:59 +02:00

qmlobserverconstants.h

QML Observer: Build together on runtime with debugging tools

2010-09-29 09:39:30 +02:00