Eike Ziller
e5ca4b3462
Merge remote-tracking branch 'origin/2.3'
...
Conflicts:
qtcreator.pri
share/qtcreator/dumper/dumper.py
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/valgrind/valgrind.pro
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
2011-07-15 14:29:07 +02:00
Christian Kamm
41b15f2fa3
QmlJS: Initialize QuickToolBar::m_editor.
...
Change-Id: I90f106affadb898b5eda613ad2a59bb3a5b53a2c
Reviewed-on: http://codereview.qt.nokia.com/1061
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com >
2011-07-11 09:57:02 +02:00
Christian Kamm
36ed6bce1d
QmlJS: Move Context to its own file.
...
Change-Id: I91331b7039e27e2f57cc19b985c8ed86c955ec9e
Reviewed-on: http://codereview.qt.nokia.com/1042
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com >
2011-07-05 11:52:20 +02:00
Tobias Hunger
aa2acec14c
Fix/add copyright headers
...
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +02:00
Thomas Hartmann
402daade93
QtQuickToolBar: disable gradient editing in PropertyChanges
...
Editing gradients in PropertyChanges is not allowed.
Task-number: QTCREATORBUG-2969
2011-03-17 10:44:31 +01: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
Kai Koehne
5e6496f664
QmlJsEditor: Add copyright header
2011-02-18 11:50:28 +01:00
Friedemann Kleint
edb4893547
Header cleanup in src, specify module name.
2011-01-24 12:29:48 +01:00
Christian Kamm
34093064fe
QmlJS: Make evaluator understand expression statements.
...
Reviewed-by: Erik Verbruggen
2010-11-25 15:06:44 +01:00
Oswald Buddenhagen
04d4d309f7
Merge remote branch 'origin/2.1'
...
Conflicts:
share/qtcreator/static.pro
src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
src/plugins/projectexplorer/outputwindow.cpp
2010-11-15 19:03:18 +01:00
Christian Kamm
f7a077b1fa
QmlJS: Avoid infinite loop with recursive prototypes.
2010-11-15 10:36:22 +01:00
Thomas Hartmann
7b179fea73
QuickToolBar: critical bugfix
...
The protype chain is cached in m_prototypes,
but the type might have changed.
We have to check for this case.
Reviewed-by: Lasse Holmstedt
2010-11-11 16:33:13 +01:00
Thomas Hartmann
24a76a73a9
fix warnings
...
Reviewed-by: Marco Bubke
2010-10-21 17:14:27 +02:00
Thomas Hartmann
408214486f
QuickToolBar: reduce usage of lookup context
...
Getting the lookup context is expensive. So it is now done only
on user interaction.
Reviewed-by: Roberto Raggi
2010-10-21 15:42:26 +02:00
Thomas Hartmann
e788d9f062
QmlDesigner: fix warnings
2010-09-08 16:36:17 +02:00
Christian Kamm
87e04df257
QmlJS: Refactor LookupContext creation for speed.
...
* If possible, create LookupContexts through SemanticInfo; it caches the
linked Context and will be faster.
* Contexts now own their Engine.
Reviewed-by: Lasse Holmstedt
2010-08-26 11:34:29 +02:00
Thomas Hartmann
d82acb2c31
fix warning and possible bug
2010-08-18 16:39:22 +02:00
Thomas Hartmann
76c865fc61
QuickToolBar: support for PropertyChanges
...
The ToolBar now detects the target type of the target
of a PropertyChanges object.
2010-08-18 16:25:25 +02:00
Thomas Hartmann
2c160a9b2a
QmlJSEditor: extending IContextPane with a signal
...
closed() is emitted when the pane is hidden/closed.
2010-08-13 17:22:19 +02:00
Thomas Hartmann
36edd86441
QmlJSEditor: Add QuickToolBar to QmlJSEditor
...
QmlDesigner is not needed anymore for the QuickToolBar
QmlJSEditor has a depends now on libs/qmleditorwidgets
2010-08-12 15:51:14 +02:00
