Commit Graph

802 Commits

Author SHA1 Message Date
Christian Kamm
3fbc0bd31d QmlDump: Fix use with namespaced types.
Reviewed-by: Roberto Raggi
2010-11-30 13:42:00 +01:00
Christian Kamm
e732b3c102 QmlDump: Allow building and using with Simulator Qt >= 4.7.1.
Reviewed-by: owolff
Reviewed-by: Kai Koehne
2010-11-26 11:18:26 +01:00
Kai Koehne
d2ed221b1b QmlObserver: Add 'show app on top' switch to creator + qmlobserver
This is convenient especially in the observer mode.

Reviewed-by: Christiaan Janssen
2010-11-23 16:24:23 +01:00
Kai Koehne
e0811beef3 QmlJsDebugger: Code cleanup 2010-11-23 16:24:23 +01:00
Kai Koehne
302a07b05b QmlJSDebugger: Fix indentation in .pri file 2010-11-23 16:24:22 +01:00
Kai Koehne
ff7abee83b QmlJsDebugger: Remove QWEAKPOINTER_ENABLE_ARROW define
Any DEFINE used in qmljsdebugger-lib.pri is also passed to the users
code.
2010-11-23 16:24:22 +01:00
Kai Koehne
28adb0a178 QmlJSDebugger: Remove editor.pri
Incorporate into qmljsdebugger-lib.pri

Task-number: QTCREATORBUG-2951
2010-11-23 16:24:22 +01:00
Kai Koehne
8b59a52bc1 Revert "make compile against 4.7 mainline"
This reverts commit 110c58d09e,
and enables qmljs debugging again.
2010-11-19 15:52:11 +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
Oswald Buddenhagen
04d4d309f7 Merge remote branch 'origin/2.1'
Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
2010-11-15 19:03:18 +01:00
Kai Koehne
d16c75fe00 QmlJSDebugger: Simplify selection handling code
Avoids multiple calls singleSelectionManipulator.select().
2010-11-12 15:08:09 +01:00
Kai Koehne
3bec12a4bf QmlJsDebugger: Avoid CURRENT_OBJECTS_CHANGED message flooding 2010-11-12 15:08:09 +01:00
Kai Koehne
4201046b9b QmlObserver: Remove breadcrumb widget in observer mode
I wasn't able to get it working on Mac OS X: Putting it on top
of the QGraphicsView doesn't work because Cocoa doesn't allow a
widget to be on top of OpenGL viewport. Embedding it as a
QGraphicsProxyWidget produces lots of Cocoa warnings (raster engine related).

Anyhow, the same widget shows up in the Debugger/Observer tab of
Qt Creator.

Reviewed-by: Lasse Holmstedt
2010-11-11 12:51:15 +01:00
Thomas Hartmann
f7e7de44cb QmlJS: Dump isWritable and isPointer for types.
Reviewed-by: Christian Kamm
2010-11-11 11:49:11 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
2010-11-10 17:02:40 +01:00
Kai Koehne
3d758f12c4 QmlObserver: Fix compilation if no private headers are installed
Use the copy of the qdeclarativedebughelper_p.h that we have in
qtcreator instead.

Reviewed-by: Christiaan Janssen
2010-11-09 12:40:06 +01:00
Bill King
110c58d09e make compile against 4.7 mainline 2010-11-09 14:53:21 +10: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
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
Kai Koehne
26f79571e6 QmlObserver: Use new 4.7.1 API to enable qml debugging
Qml debugging is now disabled by default, and has to be enabled
explicitly (b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...

Reviewed-by: Alessandro Portale
2010-11-03 14:07:16 +01:00
Kai Koehne
2ac91abd30 QmlApp template: Use new 4.7.1 API to enable qml debugging
Qml debugging is now disabled by default, and has to be enabled
explicitly (b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...

The patch introduces a static create method to QmlApplicationViewer,
so that the setup can be hidden from the users main file.

Reviewed-by: Alessandro Portale
2010-11-03 14:06:44 +01:00
con
dbb1c5ef77 Merge remote branch 'origin/2.1' 2010-11-02 11:14:03 +01:00
Alessandro Portale
7d622f1145 Changing template/qmljsdbg-lib as suggested in QTCREATORBUG-2885
- Renaming the screen orientation enum and keys
- Explicit constructors
- Virtual destructors
- Renamed some occurences of 'Qml' in comments to 'QML'
- Adding descriptive comments to all generated files which should
  not be touched by the user.
- Adding missing license headers to the qmljsdebugger sources

Task-Number: QTCREATORBUG-2885
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
2010-11-01 17:03:46 +01:00
hjk
0afb34d5eb debugger: refactor breakpoint type, add function name to resolved jsbreakpoints 2010-10-29 14:31:16 +02:00
hjk
a3b24d233c debugger: pimpl JSDebuggerAgent 2010-10-27 18:44:25 +02:00
hjk
0593aa5bba jsdebugger: add a dummy entry to arrays that have no real children 2010-10-27 18:03:11 +02:00
hjk
f51301585e jsdebugger: use a real structure for a stack frame in the debuggeragent 2010-10-27 17:38:00 +02:00
hjk
f93fe86be7 jsdebugger: don't output function code. it's useless. 2010-10-27 17:38:00 +02:00
hjk
63ca71c2c7 jsdebugger: use QByteArray for data transfer
Easier to debug, less data to transfer.
2010-10-27 17:38:00 +02:00
Kai Koehne
665527346c QmlObserver: Fix "Waiting for connection ..." message box on exit (Windows)
Disable the message box feature alltogether: Debugging output should be
captured by QtCreator already.

Task-number: QTCREATORBUG-2748
2010-10-15 12:54:07 +02:00
Kai Koehne
87bb227605 QmlJSDebugger: Don't crash when using wheel & no items selected
Task-number: QTCREATORBUG-2739
Reviewed-by: Lasse Holmstedt
2010-10-14 14:45:43 +02: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
0a8c34d382 QmlApp: Only use QMLJSDEBUGGER define to activate qml debugging
Don't confuse users by two defines they have to comment in when
they just want to 'debug': Instead QMLJSDEBUGGER now activates
both the Js Debugger & and the QmlObserver services. Finetuning
can still be done by using the (undocumented) NO_JSDEBUGGER,
NO_QMLOBSERVER defines.
2010-10-13 16:52:58 +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
878f146ede QmlObserver: Fix QPainter warnings
The specified images in the resources weren't part of the qmlobserver,
and therefore 'tinting' then resulted in QPainter errors.

Task-number: QTCREATORBUG-2562
Reviewed-by: Lasse Holmstedt
2010-10-08 15:51:55 +02:00
Kai Koehne
5532f939b5 QmlObserver: Fix compilation if no private headers are installed
Don't support the Recording + Test Script features if there are
no private headers installed.

Reviewed-by: Lasse Holmstedt
2010-10-06 14:59:25 +02:00
Kai Koehne
c6c2486d5d QmlJSDebugger: Fix linkage error
Make sure that the private API used from Qt is compiled with
Q_DECL_IMPORT.

Task-number: QTCREATORBUG-2609
2010-10-05 16:58:59 +02:00
Kai Koehne
c1954e09fc QmlJSDebugger: Fix path in standalone .pro file 2010-10-05 16:58:59 +02:00
Kai Koehne
1e19803e6e qmldump: Allow qmldump to be also built in release mode
Don't force that qmldump is compiled in debug mode: This won't work
with a Qt compiled only in release mode.

If Qt is built with debug_and_release, qmldump will be build in release
mode.

Reviewed-by: ckamm
2010-10-05 12:45:10 +02:00
Lasse Holmstedt
2578810334 Debugging helpers: Preserve whole build log
Otherwise, users might only see parts of the build that succeeded, but
not the failed ones (depending on build order).

Reviewed-by: ckamm
2010-10-04 12:03:35 +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
6929d66ff2 QmlObserver: Prevent messages from being sent if there is no server side
Actually this is fixed in QDeclarativeService::sendMessage, too, but the
fix won't be part of 4.7.1, so better double-check.

Reviewed-by: Christiaan Janssen
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
Kai Koehne
f343cc4bd4 QmlJSDebugger: Update API to changes in QDeclarativeEngine
Reviewed-by: Christiaan Janssen
2010-10-01 13:43:40 +02:00
Christian Kamm
6f1c1af833 QmlJS: Prepare qmldump for multiply exported C++ objects.
In the future, builtin objects are going to be exported in Qt 4.7 and
QtQuick 1.0.

Reviewed-by: Roberto Raggi
2010-10-01 10:14:29 +02:00
Marco Bubke
45bdff449d QmlDesigner: Items in Positioner cannot manipulated anymore
Add a positioner node instance and the concept of resizable and movable
items. Item in a positioner will be not selected anymore. Instead their
positioner will be selected which is not resizable.
2010-09-29 13:54:27 +02:00
Lasse Holmstedt
91c0df0689 Build QMLObserver and qmldump only in debug mode
The problem is that we actually should have both debug & release builds,
but we don't have detection at the moment which binary to use.
See QTCREATORBUG-2496

Reviewed-by: Thomas Hartmann
2010-09-29 10:57:16 +02:00
Lasse Holmstedt
64f980a38b Fixed copying files from share
Reviewed-by: kkoehne
2010-09-29 10:07:19 +02:00