feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
19,154 Commits 108 Branches 368 Tags
e0f79761f3a3d43bcff2b46736c0cf6aa4572bac
Commit Graph

80 Commits

Author SHA1 Message Date
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
Kai Koehne
8a48ef7869 QmlJSInspector: Remove disconnect without a connect 2010-10-01 17:32:45 +02:00
Kai Koehne
226a82d3dc QmlDebugger: Log status of different services 
Reviewed-by: Christiaan Janssen
 2010-10-01 13:43:42 +02:00
Kai Koehne
610711724b Inspector: Rename QmlJSDesignDebugClient to QmlJsObserverClient 
Unify terminology somewhat.
 2010-09-16 15:48:00 +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
Christiaan Janssen
1c702357a6 QmlInspector: tooltips in qmldebug mode 
Reviewed by: Lasse Holmstedt
 2010-09-08 16:53:44 +02:00
Olivier Goffart
d8d46ed1d9 qmljsinspector: small code cleanup 2010-08-30 18:41:14 +02:00
Olivier Goffart
d7fb215e2e qml debugger: Use a hash table to store the debugId 
This should speed up the matching between the AST nodes and the debugIds
 2010-08-30 12:21:27 +02:00
Christiaan Janssen
7d9056953e QmlInspector: Added reparenting of items in the Qml Live Preview. Reviewed by: Lasse Holmstedt 2010-08-26 17:38:42 +02:00
Olivier Goffart
47db341b67 qmlobserver: Remove the changed() hack to get new object. 
There is now a hook in QDeclarative itself for that.
Needs commit af2b28f9ca07057 of Qt
 2010-08-24 18:16:23 +02:00
Olivier Goffart
ce134d37f7 QmlDebugger: use another way for detecting new objects 2010-08-24 18:16:23 +02:00
Olivier Goffart
af94dad9bc Qml Debugger: process the contexts recursively 2010-08-20 17:31:07 +02:00
Olivier Goffart
a18c8f9e96 QML Debugger: request objects from all contexts 2010-08-20 15:57:02 +02:00
Olivier Goffart
0b09a59ef2 QML Debugger: Avoid infinite recursion if one can't find a debug id 2010-08-19 11:35:39 +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
hjk
2859065193 qmljsinspector: movve debugger related code around 2010-08-12 10:38:55 +02:00
hjk
4fb517c53e qmljsinspector: code cosmetics 2010-08-12 10:38:55 +02:00