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

27 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Olivier Goffart
f3cdbeff63 QmlJsInspector: remove private header dependencies 
A copy of the client debugging code is made in src/libs/qmljsdebugclient/
(this comes from the qt code from commit 65642dd343bf61)

So the qmljsinspector plugin does not require anymore Qt private headers.
 2010-07-29 14:36:11 +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
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
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
982bc3e3ff Removed slot declaration 2010-07-16 16:17:49 +02:00
Lasse Holmstedt
e0aa4f86f2 changing QmlJsLivePreview to work with multiple documents 2010-07-16 16:12:06 +02:00
Lasse Holmstedt
20902cf189 Moved debug id -> AST mapping code to livepreview class 2010-07-14 17:47:59 +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
Lasse Holmstedt
aa4f9725eb removed undefined slot 2010-07-08 13:48:27 +02:00
Lasse Holmstedt
9a81759101 manually applied changes from qmlinspector to qmljsinspector 2010-07-08 11:36:26 +02:00