Commit Graph

96 Commits

Author SHA1 Message Date
Aurindam Jana
16d5b5165c QmlJSInspector: Show root in property inspector
Change-Id: I281ef1f74e8d8128b91c426057c4d727a77543a6
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-30 14:24:57 +02:00
Aurindam Jana
95cfe23e95 QmlJSInspector: Optimize server requests
Fetch objects on demand. Update objects that are
currently in the crumble path rather than query the
complete tree.

Change-Id: Id4e263fa7a35c90248444461210dbba32dd61b12
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-30 08:19:04 +02:00
Aurindam Jana
f14dffe681 QmlJSInspector: Remove Color Picker Tool
Change-Id: Ic1a158f3e96052fcf30071ec827c23a4a83625f5
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-26 11:39:11 +02:00
Aurindam Jana
e412a93006 QmlJSInspector: Query Objects Iteratively
Currently all objects are recursively fetched when the root context
is retrieved. This patch fetches objects on demand.

Change-Id: Idf5c621ec38869dd5a676116bc4df528d7bb2fda
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-22 14:22:06 +01:00
Aurindam Jana
66ed2b37ba QmlDebugging: Add service client for QmlDebugger
Qt5 has renamed the service 'QDeclarativeEngine' to 'QmlDebugger'.
Add a new client to connect to the service.

Change-Id: I3a03181c4f34c311e47d4a963283b66dc778726b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-22 14:21:53 +01:00
Aurindam Jana
4cd2e32659 QmlEngineDebugClient: Simplify the client and utility classes
Change-Id: I86033bdbdef94c6f17e706f8e13ce390969171c6
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-22 14:21:34 +01:00
Aurindam Jana
06ae4b3512 QDeclarativeEngineDebug: Rename class
Renamed to QmlEngineDebugClient

Change-Id: I200e8ccf23a3464e2b6ad07288d17228118e905f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-21 14:29:33 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Aurindam Jana
cb0b3424b3 QmlJSScriptConsole: Refactored ScriptConsole, added functionality.
The ScriptConsole is renamed to QmlJSScriptConsole. The console can be used
to evaluate expressions during a QML application debug session.
Changes:
* Console can be used even when application is not on a debug break
* The object context is the currently selected object in Inspector
* ContextMenu has a Clear option
* Multiple line expressions are supported
* Traverse Command History using up and down arrow keys

Change-Id: I4e1cd8763d60be43dbba395ead2a9a086d6bab7d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-10-12 15:03:00 +02:00
Kai Koehne
06a2a46f43 QmlDebugger: Also show status of QDeclarativeEngine client in log
Fix QDeclarativeEngineDebug to use the same enum as the other clients.
Also, use objectName() to name the clients.

Change-Id: I826970bf248ce2f50c4bf66c1f58c0b9b56698b1
Reviewed-on: http://codereview.qt-project.org/5231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2011-09-20 16:13:54 +02:00
Kai Koehne
33c96800f0 QmlJSDebugger: Fix crash when stopping debugger
The destructor of QmlAdapter deletes the QDeclarativeDebugConnection,
which in turn results in status changes to the QmLJSInspectorClient. This
again leads to QmlAdapter::logServiceStatusChange() being called for the
already half-destructed object ... break this change by guarding the pointer
to QmlAdapter in QmlJSClientProxy.

Change-Id: I7ae3d45b2146b4f02e3843375ecf276ae75d5ea0
Task-number: QTCREATORBUG-5500
Reviewed-on: http://codereview.qt.nokia.com/2276
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-27 13:47:47 +02:00
Kai Koehne
51a9ff7d4e Qml Tooling: Fix debugging & profiling of .qml files loaded from resources
Don't expect that every url specifying a file is a local file url. Instead
let FileInProjectFinder handle urls with other schemes gracefully, too.

Change-Id: I72457d502ff1caf52f588e8ec41ab260882d1cf5
Reviewed-on: http://codereview.qt.nokia.com/1840
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-21 12:27:43 +02:00
Thorbjørn Lindeijer
335f6ad0f7 QmlJSInspector: Renamed Observer to Inspector
Manually redid Qt 4.8 commit 206ebd5af21d94c3f3b49d2cb645105a63e6f5fb,
to make future code synchronization easier.

In order not to have to change the QmlApplicationViewer again, a
compatibility class QDeclarativeViewObserver is retained that subclasses
QDeclarativeViewInspector.

Change-Id: Ief87ae2f8f76b1db0c9d65085e4832424b277603
Reviewed-on: http://codereview.qt.nokia.com/242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-31 09:44:09 +02:00
Thorbjørn Lindeijer
5647e67762 QmlJSInspector: Fixed multi-selection bug
Nothing useful can be done with multi-selection at the moment, but this
bug was introduced in 8d0601515e and is
better to fix straight away.

What happened was that when multiple items are selected in the observed
QML application, Qt Creator would pick the first and send that back as
the new selection. This made it impossible to select more than one item.

Task-number: QTCREATORBUG-3426
Change-Id: I68283480af5e0a21e32e51a49848ff9a809ed5ec
Reviewed-on: http://codereview.qt.nokia.com/151
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-26 16:55:16 +02:00
Thorbjørn Lindeijer
97ca81fc6d QmlJSInspector: Removed context path related things
Apparently this part of the protocol was already not being used at all.
Now that the SubcomponentEditorTool will be removed it is no longer
relevant.

Change-Id: I5710fe815be233548e590e90410b85ed4fa3487c
Reviewed-on: http://codereview.qt.nokia.com/88
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-25 10:12:54 +02:00
Christiaan Janssen
3cf5379380 QmlLivePreview: removing and inserting animations and transitions
Change-Id: Ic776f63f5d7925ac7dfd99be53c10b9af4cb9545
Reviewed-on: http://codereview.qt.nokia.com/75
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-24 13:03:43 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Christiaan Janssen
89d9b83aa2 QmlDebugger: adding slots to items in Live Preview
Reviewed-by: Kai Koehne
2011-05-05 17:03:37 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Kai Koehne
986c9560e9 QmlObserver: Fix 'Apply Changes on Save' on Mac
Use the generic FileInProjectFinder instead of some homebrewn
matching algorithm (which didn't handle the case that on  Mac OS X,
files are copied to the app bundle).

Reviewed-by: Christiaan Janssen
Task-number: QTCREATORBUG-3188
2011-04-08 11:58:48 +02:00
Thorbjørn Lindeijer
a8bf2ba5e3 QmlJSDebugger: Renamed "execution paused" to "animation paused"
The latter better describes what is paused, since expressions are
actually still executed.

Suggested by Kai.
2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
0a813cd67c QmlJSDebugger: Separated animation speed and paused state
This separates animation speed and paused state in the communication
protocol between the Qt Creator QmlJSInspector plugin and the
QmlJSDebugger server.

Point is to allow changing the speed of the animation before resuming
execution. These two things were already separated in the QML Observer,
but not in Qt Creator.

Reviewed-by: Kai Koehne
2011-03-22 10:40:46 +01:00
Kai Koehne
58e697bc09 QmlDebug: Fix crash on app closing
Make sure that the engineClient object is the parent of all of its
queries, since the destructor of a query might try to access the client
...

Reviewed-by: Christiaan Janssen
Task-number: QTCREATORBUG-4105
2011-03-21 15:07:34 +01:00
Kai Koehne
bd2e4af905 QmlJsDebug: Remove unused code 2011-03-21 15:07:34 +01:00
Kai Koehne
f70bc0180d QmlDebug: Remove assert
Removing an object watch might fail if e.g. the app crashes in between.
2011-02-18 11:50:27 +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
841a228507 QmlJS Debugging: Log activitiy of QDeclarativeEngine in debugger log
However ignore messages for watches, because they otherwise flood the log.
2011-02-07 16:32:05 +01:00
Christiaan Janssen
0e4766465f QmlDebugger: bypassing jsdebugger stop when querying expressions
Reviewed-by: Kai Koehne
2011-01-25 10:59:39 +01:00
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +01:00
Christiaan Janssen
f5039a4a02 QmlJsInspector: implemented Property Inspector
Reviewed-by: Kai Koehne
2011-01-20 15:11:39 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +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
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
Christiaan Janssen
5ed78fb633 QmlDebugger: Fixing debugid hashes
Reviewed-by: Kai Koehne
2010-12-14 16:22:28 +01:00
Kai Koehne
f179c9362f QmlJsInspector: Fix typo in method name 2010-12-03 10:40:01 +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
c43496d035 QmlJSInspector: API cleanup
Give m_client, m_designClient member variables more descriptive names.
2010-11-12 15:08:09 +01:00
Kai Koehne
1cc61e06ea QmlJSInspector: API cleanup
Simplify method names.
2010-11-12 15:08:09 +01:00
Kai Koehne
59060fb225 QmlJSObserver: API cleanup
Change signature of setSelectedItemsByObjectId to match the one from
signal currentObjectsChanged.
2010-11-12 15:08:09 +01:00
Kai Koehne
d1175f3ea2 QmlJSObserver: Fix crash when adding an element to some .qml files
Make sure that the 'artifical' URL of the item created actually is
absolute (starts with a file:///). Otherwise an Assert will be hit
when the imports include e.g. a .js file, and the Engine tries to
load it.

Task-number: QTCREATORBUG-2644
Reviewed-by: Olivier Goffart
2010-10-08 15:51:56 +02:00
Kai Koehne
e0b11d4374 QmlJSInspector: Guard qDebug output 2010-10-08 15:51:55 +02:00
Olivier Goffart
6d73634429 Fix typo in a comment 2010-10-07 11:25:53 +02:00
Kai Koehne
5a6faea21f QmlJsInspector: Remove unconditional qDebug 2010-10-01 17:42:13 +02:00
Kai Koehne
4cbbe9ca7b QmlInspector: Fix regression making the observer unusable
We've to wait with reloadEngines until the services are actually
enabled.
2010-10-01 17:34:06 +02:00
Kai Koehne
83e2a37850 QmlObserver: Disable UI when no server plugin exists
Reviewed-by: Christiaan Janssen
2010-10-01 17:34:01 +02:00