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
Thomas Hartmann
121b6cb466
QmlDesigner.propertyEditor: code cleanup for property editing
...
Instead of duplicating the code from QmlEditorWigets we now subclass
and expose the gradient editing to qml.
The adaptor class is called GradientLineQmlAdaptor.
2010-12-16 17:47:54 +01:00
Thomas Hartmann
3d2aae0766
QuickToolBars: fix cursor on Mac OS X
...
We have to set the cursor on Mac OS X
manually in enter and leave events.
Task-number: QTCREATORBUG-2622
Reviewed-by: Kai Koehne
2010-11-04 11:15:47 +01:00
Thomas Hartmann
45aa74ab07
QtQuickToolBars: bugfix for TextInput and TextEdit
...
TextEdit and TextInput were ignored
Reviewed-by: Kai Koehne
2010-10-08 15:28:56 +02:00
Friedemann Kleint
d207c8cdcb
L10n: tr()-fixes, message strings, compiler warnings.
...
Rename 'QML standalone application' to 'QML application'
and the 'old-style' QML applications to
'QML Viewer based applications'.
For the QML renaming:
Rubber-stamped-by: Alessandro Portale <alessandro.portale@nokia.com >
2010-09-15 15:16:13 +02:00
Thomas Hartmann
36a955fa1e
QuickToolbar: unifies naming to Quick ToolBar and clarifies tooltips
2010-09-01 11:55:03 +02:00
Thomas Hartmann
164b81add7
QuickToolBar: use (x) icon to hide ToolBar
2010-08-17 15:41:35 +02:00
Thomas Hartmann
b372f9db02
QuickToolBar: use absolute positioning for dragging
...
This resolves several usability bugs.
2010-08-13 17:22:22 +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
12916161ab
Creating lib: qmleditorwidgets
...
The library qmleditorwidgets contains widgets and image resources
what are shared between QuickToolBar and QmlDesigner
This library is created to make QuickToolBar independent from
QmlDesigner plugin.
All the widgets I moved to qmleditorwidgets are removed from
QmlDesigner in this patch
2010-08-12 15:50:17 +02:00
