Commit Graph

485 Commits

Author SHA1 Message Date
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
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
Lasse Holmstedt
5d9858129a Compile qmldump with debugging helpers
Must be compiled during runtime - otherwise, the app may not work
with Qt that is compiled with another compiler.

Reviewed-by: hjk
2010-09-29 09:39:18 +02:00