Kai Koehne
28adb0a178
QmlJSDebugger: Remove editor.pri
...
Incorporate into qmljsdebugger-lib.pri
Task-number: QTCREATORBUG-2951
2010-11-23 16:24:22 +01:00
dt
c9c5fe1542
Merge remote branch 'origin/2.1'
...
Conflicts:
share/qtcreator/static.pro
src/plugins/qmljseditor/qmljshoverhandler.cpp
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
2010-11-18 19:28:23 +01:00
Kai Koehne
2b8e5b5333
QmlObserver: Fix navigation on Mac OS X
...
The QmlObserver relies on installing an event handler on the graphicsview
viewport, to get e.g. Mouse events.
QmlObserver on Mac OS X switches the viewport later on to a QGLViewPort, when
QmlObserver has already been set up ... Make QmlObserver aware of this by
listening to the ChildRemoved event that will be signalled in this case.
Task-number: QTCREATORBUG-2892
Reviewed-by: Lasse Holmstedt
2010-11-16 11:01:01 +01:00
Kai Koehne
3bec12a4bf
QmlJsDebugger: Avoid CURRENT_OBJECTS_CHANGED message flooding
2010-11-12 15:08:09 +01:00
Kai Koehne
bb27ed24bf
Revert "QmlJsDebugger: Fix observer navigation on Mac OS X"
...
This reverts accidentally pushed commit 4f33fbc229
2010-11-05 16:21:00 +01:00
Kai Koehne
4f33fbc229
QmlJsDebugger: Fix observer navigation on Mac OS X
...
Seems that mouse events aren't sent through the viewport on Mac OS X.
2010-11-05 16:15:53 +01:00
Kai Koehne
1839015452
QmlJSDebugger: Highlight items only if in Observer mode
...
Task-number: QTCREATORBUG-2672
Reviewed-by: Lasse Holmstedt
2010-10-14 14:45:43 +02:00
Kai Koehne
8162839827
QmlJSDebugger: Remove reference to JSDebugger in QDeclarativeViewObserver
...
Make Observer and JSDebugger orthogonal.
2010-10-13 16:52:58 +02:00
Kai Koehne
8ad34357b8
QmlJSDebugger: Fix warning about JSAgent already connected
...
We now instantiate an extra JSDebugger object in the generated class.
Reviewed-by: aportale
2010-10-01 13:43:41 +02:00
Kai Koehne
eff5ceea64
QmlJsDebugger: Remove dependency to Qt private headers being installed
...
Copy over the private header files to creator source tree, along the
lines of the what the designer plugin does.
Reviewed-by: Christiaan Janssen
2010-10-01 13:43:40 +02:00
Lasse Holmstedt
96d991bbdc
QML Observer: Build together on runtime with debugging tools
...
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.
Reviewed-by: hjk
2010-09-29 09:39:30 +02:00
