Commit Graph

78 Commits

Author SHA1 Message Date
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Tom Sutcliffe
48fef07a08 Added some support for QML debugging over USB. Fixed some issues with -qmljsdebugger option.
Not fully working over USB yet, there are some handshaking issues that need to be addressed. WLAN might be improved due to the -qmljsdebugger fixes, but not tested.
2011-04-12 16:33:02 +02:00
Kai Koehne
873e379eba QmlDebug: QmlAdapter ws changes 2011-02-17 16:11:41 +01:00
Kai Koehne
8d14887446 QmlDebug: Move QDDEngineDebug instance to ClientProxy
Only the ClientProxy uses it anyway.

Reviewed-by: Thorbjorn Lindeijer
2011-02-17 16:11:41 +01:00
Kai Koehne
7ecac9634a QmlDebug: Remove dead code 2011-02-16 14:51:03 +01:00
Kai Koehne
b07f742d69 QmlDebug: Improve 'Failed to connect to debugger ...' dialog
Task-number: QTCREATORBUG-3795
2011-02-16 14:51:03 +01:00
Kai Koehne
a24ae63c9f QmlDebugger: Remove unused code 2011-02-16 14:51:02 +01:00
Kai Koehne
ede49086c0 QmlJSDebug: Don't show the debugger log on each exit
When closing the app via the WM the status of the services change
to 'not available'. We used to log this as an error to the debugger
log, causing the log to 'magically' pop up.

Reviewed-by: Christiaan Janssen
2011-02-09 14:39:38 +01:00
Kai Koehne
246c586dff QmlJSDebugger: Don't block UI while trying to connect
Don't use waitForConnected().
2011-02-08 17:24:48 +01:00
Christiaan Janssen
0e4766465f QmlDebugger: bypassing jsdebugger stop when querying expressions
Reviewed-by: Kai Koehne
2011-01-25 10:59:39 +01:00
hjk
ae46124a63 debugger: code cosmetics QmlAdapter 2011-01-12 14:14:57 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Friedemann Kleint
a7eccce733 Debugger: Header cleanup 2011-01-10 10:14:23 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Kai Koehne
bde8287cdd QmlDebugger: Also log messages from JSDebugger to debug console 2010-12-17 10:19:00 +01:00
Kai Koehne
761801645e QmlDebugger: Improving debug log output 2010-12-17 10:19:00 +01:00
Kai Koehne
948ca6f2ac QmlDebugger: Log activity of Observer in debugger log 2010-12-16 17:26:25 +01:00
Kai Koehne
d6bc3a2822 QmlJSDebugger: Remove confusing status messages
Clean up status messages logged in the debugger log.
2010-12-16 16:31:10 +01:00
Kai Koehne
7771518d59 QmlJSDebugger: Don't mark failing connection attempt as swarning
We're trying multiple times to connect, and it's just normal that
the first tries will fail (because the app isn't initialized yet),
so don't log it as a warning.
2010-12-16 16:20:21 +01:00
Kai Koehne
a03e75726a QmlDebugger: Buffer messages in QmlAdapter until client is ready
Don't 'loose' messages at startup because the client is not enabled
yet / sendMessage will silently fail.

Reviewed-by: Christiaan Janssen
2010-10-01 13:43:42 +02:00
Kai Koehne
226a82d3dc QmlDebugger: Log status of different services
Reviewed-by: Christiaan Janssen
2010-10-01 13:43:42 +02:00
Friedemann Kleint
f7b19f8114 Debugger: Move DebuggerEngine/QmlEngine/QmlCppEngine into Debugger{}
namespace (from Debugger::Internal) as they are exported classes.
Introduce private classes to avoid exposing private JS debugger
headers.
2010-09-13 13:30:35 +02:00
Lasse Holmstedt
31c8b444db QML Debugger: Show error messages when connection is lost
Related to Qt commit bd521ed56f8e4be7117dc3534c6fded68f7a70c5
2010-08-27 13:12:05 +02:00
Lasse Holmstedt
b557c58eac Qml Debugger: Enable debugging qml+cpp standalone applications
A new debugger engine, QmlCppEngine, is introduced, which wraps gdb
and qml engines into one. Alternatively, if using Windows, Cdb is used
instead of Gdb.

Most of the debugger ui switcher is now rewritten, and it is tailored
for the QML and CPP layout case, the only one supported anyway.

Reviewed-by: hjk
2010-08-24 17:46:22 +02:00
Olivier Goffart
9aa64498f4 Qml Debugger: set the internal on the poll timer.
(Else, we do do not have enough time to start the observer)
2010-08-16 14:23:00 +02:00
Lasse Holmstedt
b71c3c62ba QML Debugger refactoring
Now, QmlEngine creates the connection to the inferior (debuggee), and
notifies QmlInspector when a connection is established. Before,
inspector created the debugger engin, which was wrong.

QmlEngine's responsibilities are connecting to the debuggee and basic
QML/JS debugging features like locals & watchers, breakpoints etc.
QmlInspector takes care of Live Preview and other fancy inspection
features.

Reviewed-by: hjk
2010-08-13 14:20:39 +02:00