feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,713 Commits 108 Branches 368 Tags
5e543b2856bc9f0f1abedd72efc87bd009ad2fb7
Commit Graph

53 Commits

Author SHA1 Message Date
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
f576ad9f2c texteditor: merge ITextEditable into ITextEditor 
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
 2011-02-22 11:23:53 +01:00
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +01:00
Christiaan Janssen
6a829f5a8f QmlJsLiveTextPreview: adjusted ast offsets for objectbindings 
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
Christiaan Janssen
c8f050715f QmlDebugger: removed "Reload" button on live preview error 
Reviewed-by:  Kai Koehne
 2010-12-15 16:13:06 +01:00
Kai Koehne
5c67e10253 QmlObserver: Apply changes to file also if not in Debug mode 
Also apply changes to the .qml file in e.g. the Design mode to
the running application.
 2010-11-24 13:42:54 +01:00
Friedemann Kleint
77008bc45f Exported Header cleanup: QmlJSEditor 
Move internal classes QmlJSEditorEditable/SemanticHighlighter
out of qmljseditor.h. Move QmlJSEditor from namespace
QmlJSEditor::Internal to QmlJSEditor.

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2010-11-02 11:10:27 +01:00
Christiaan Janssen
0bc0a2df5a QmlObserver: showing a warning when changes cannot be synchronized 
Reviewed by:  Thomas Hartmann
 2010-09-22 16:30:21 +02:00
Christiaan Janssen
1c702357a6 QmlInspector: tooltips in qmldebug mode 
Reviewed by: Lasse Holmstedt
 2010-09-08 16:53:44 +02:00
Lasse Holmstedt
3499fcb18e QML Inspector: Remove check for files being in project 
Did not work e.g. for projects where non-project files are loaded.
 2010-08-31 10:11:12 +02:00
Olivier Goffart
437ec03a35 Qml Debugger: fix the fact that the selection rectangle is not updated. 
This happened if the file is openned after the debugger has started
 2010-08-30 14:10:27 +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
Olivier Goffart
af01698cfc qmljsdelta: Fix updating property on UiObjectBinding 2010-08-27 17:15:21 +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
Lasse Holmstedt
fe55ba5cd2 QML Inspector: Don't update debug id's when not debugging 
Creating LookupContext seems to be expensive, so don't update anything
unless debug mode is already running.
 2010-08-24 17:46:22 +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
a18c8f9e96 QML Debugger: request objects from all contexts 2010-08-20 15:57:02 +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
Lasse Holmstedt
d572efedbd Added settings class to QML Inspector 
For starters, we only remember whether the initial warning about dangers
of Live Preview was shown.
 2010-08-12 09:39:26 +02:00
Lasse Holmstedt
85bafac50e QML Observer: Refresh debug id's when new objects are created 
Previously, the user had to navigate to the context of a qml item in
order to edit its source code in Live Preview mode. This change tells
the client to update when new objects are created on server-side, and
makes the editing possible without having to manually trigger updates.
 2010-08-06 14:03:33 +02:00
Lasse Holmstedt
714a266cbe QML JS Inspector: Improve warning messages 
When a change is done to an element that cannot be changed due to
debugger/qdeclarative limitations, a warning is shown to the user in QML
JS Editor.

Reviewed-by: Olivier Goffart
 2010-08-05 16:31:13 +02:00
Lasse Holmstedt
719b775792 QML JS Inspector: Added method to clear component cache 
This one should be called when a component is changed and components
using it need to be reloaded.
 2010-08-05 11:53:12 +02:00
Olivier Goffart
eb44801bed QmlJs Live preview: Fixed a bug that lead an object to be associated with 2 debug id. 
If an object is created at the same location of another old object,
It could be matched.
 2010-08-03 18:39:53 +02:00
Lasse Holmstedt
393ca274d9 QML Observer: Changed warning message to mention reloading 2010-08-02 17:31:11 +02:00
Lasse Holmstedt
2c15b30a20 Qml JS Live Preview: Show warnings when running Live Preview 
Two kinds of warnings are now shown: one for warning about the Live
Preview itself, as it is experimental, and another when user changes
id's of objects during runtime, as this is not supported at the moment.

More warnings will be added later for other unsupported changes.
 2010-07-30 15:28:19 +02:00
Lasse Holmstedt
cdb5dadfc2 QmlJS Live Preview: Fixed highlighting from text editor-> qml observer 
Now, the items about to be selected must inherit from QGraphicsObject.
Also, coding style was cleaned up a bit.
 2010-07-27 11:58:38 +02:00
Lasse Holmstedt
c7a8d93765 QmlJS Live Preview: Implemented "Apply changes from Qml File" button 
The button is checkable and pressing it will stop/propagate changes to
the qml application being debugged.
 2010-07-27 11:58:38 +02:00
Olivier Goffart
f24216bdbb QmlJsDelta: moved to the QMLJS library 
Also used 'int' instead of QDeclarativeDebugObjectReference for
the debug id in order not to use the private API from QMLJS
 2010-07-21 14:27:38 +02:00
Olivier Goffart
31949f1890 QmlJsDelta: move to the QmlJs namspace 2010-07-21 14:27:38 +02:00
Olivier Goffart
3c7528d572 QmlJsDelta: refactor to split the stuff specific to the QML Live Preview out 2010-07-21 14:27:38 +02:00
Olivier Goffart
a97bede341 add missing licence header 2010-07-20 12:54:25 +02:00
Olivier Goffart
95346f79e6 Qml Live Preview: lazily create QmlJSLiveTextPreview 2010-07-20 12:54:25 +02:00
Olivier Goffart
7bef076411 Qml Live Preview: Update the QmlJSLiveTextPreview When the document is reloaded. 
When the document is reloaded by the server, we need to refresh
refresh what was the loaded document, and refresh the debugIds
 2010-07-20 12:54:24 +02:00
Olivier Goffart
1ce574f19e Qml Live Preview: Match debug Id for new created objects. 2010-07-19 15:38:46 +02:00
Olivier Goffart
3961676569 QML Live Preview: Find the debug ids of the root nodes 2010-07-19 11:24:44 +02:00
Olivier Goffart
d7db1c9b60 QML Live Preview: avoid to crash if ast->qualifiedTypeNameId->name is null 
We do not need this check anyway.
 2010-07-19 11:17:43 +02:00
Olivier Goffart
c1d681811a QmlJsDelta: When coputing the debug ids, we need to do it on the original document. 
Else, the line numbers does not match anymore.
 2010-07-16 16:38:50 +02:00
Lasse Holmstedt
e0aa4f86f2 changing QmlJsLivePreview to work with multiple documents 2010-07-16 16:12:06 +02:00
Olivier Goffart
181e708633 QmlJsDelta: attempt to keep the ast node in sync 2010-07-16 12:02:47 +02:00
Lasse Holmstedt
20902cf189 Moved debug id -> AST mapping code to livepreview class 2010-07-14 17:47:59 +02:00
Lasse Holmstedt
4a4fc8584f update object tree when unknown debug id is received 2010-07-14 15:31:24 +02:00
Lasse Holmstedt
8936292dc2 modified selection to accept items without id's 
also cleaned up old stuff
 2010-07-14 15:30:54 +02:00
Olivier Goffart
42abd8b15c QmlJS::Delta: fix crash if a document does not have a qmlProgram 2010-07-14 15:30:54 +02:00
Lasse Holmstedt
25b86926c7 fixes related to update of delta 2010-07-14 15:30:54 +02:00
Lasse Holmstedt
4ecad983ec added multiselection from editor to qml viewer 2010-07-14 15:30:53 +02:00
Olivier Goffart
8f528e241d QMLJS::Delta: Improved the delta 
Use a smarter way to compare the AST (based on the diffX algorithm)
That way we do not rely anymore on the id property
 2010-07-14 15:30:53 +02:00