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
hjk
5bce99b9e5
Replace BaseMode convenience class by individual implementation.
...
Using the convienience class does not really save code and adds another
needless level in the hierarchy. This affects the three remaining BaseMode
users: Help, ProjectExplorer and HelloWorld.
2010-12-07 16:45:58 +01:00
Friedemann Kleint
d2e8819f9a
Set some object names for easier debugging.
2010-12-03 17:31:01 +01:00
kh1
37b06903d3
Move some code to where it belongs really.
2010-07-23 11:21:06 +02:00
kh1
42e01eaaab
Move the constants where they belong.
2010-03-23 18:13:07 +01:00
kh1
63f31dcb66
Remove some superfluous stuff.
2010-03-23 18:13:04 +01:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
Tobias Hunger
a6ad773722
Make method naming more consistent.
...
* Use id() for methods returning a string used to represent
some type of object.
* Use displayName() for strings that are meant to be user
visible.
* Quieten some warnings while touching the files anyway.
* Move Factories to their products in the plugins where that
was not done before.
Reviewed-by: dt
2010-01-07 18:17:24 +01:00
Friedemann Kleint
74a3828f19
Purge out include files in exported headers
2009-10-01 16:38:08 +02:00
hjk
93cbef8724
long live the king
2009-08-14 09:30:56 +02:00
con
091f372723
Making the find tool bar be more connected to the searched text.
2009-07-21 13:44:30 +02:00
Jason McDonald
884b7af769
Update license headers and sales contact details.
...
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
hjk
8ca887aae2
Fixes: change file license headers to include LGPL
2009-02-25 09:15:00 +01:00
hjk
d0725e31a4
remove "fat" BaseMode constructor
2009-01-14 12:00:22 +01:00
Daniel Molkentin
59affcfffc
Bump year in licence header.
2009-01-13 19:22:14 +01:00
hjk
da3cb14483
chancge Nokia GPL exception version from 1.2 to 1.3
2008-12-16 17:20:00 +01:00
hjk
cf11b69643
more code cosmetics
2008-12-02 16:19:05 +01:00
hjk
ab83dcd87c
off-by-one in headers
2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3
end-of-line whitespace correction of the new headers
2008-12-02 14:17:16 +01:00
con
05c35356ab
Initial import
2008-12-02 12:01:29 +01:00
