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 |
|
Tobias Hunger
|
8808f0fa2d
|
VCS: Handle code folding in diff view
Allow to do codefolding on files and hunks in the diff editor
|
2010-11-22 12:03:08 +01:00 |
|
Roberto Raggi
|
8acde74d79
|
Forked QSyntaxHighlighter from Qt 4.7.
We need our very own syntax highlighter in Qt Creator.
|
2010-07-09 14:47:18 +02:00 |
|
hjk
|
9595504bda
|
Long live the king!
|
2010-03-05 11:28:13 +01:00 |
|
Friedemann Kleint
|
accc2c6926
|
Diff-Highlighter: Mark trailing whitespace in added lines.
... using inverted colors.
|
2009-12-04 14:23:34 +01:00 |
|
hjk
|
93cbef8724
|
long live the king
|
2009-08-14 09:30:56 +02:00 |
|
Jason McDonald
|
884b7af769
|
Update license headers and sales contact details.
Reviewed-by: Trust Me
|
2009-06-17 00:01:27 +10:00 |
|
Friedemann Kleint
|
6ffdf7cf40
|
Fixes: Add a combo for diff file browsing, bring diff editors to front, exclude qconfig.pri from files examined by p4.
Task: 234842
|
2009-03-10 11:02:12 +01:00 |
|
hjk
|
8ca887aae2
|
Fixes: change file license headers to include LGPL
|
2009-02-25 09:15:00 +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
|
4a552ead9f
|
use QTC_ASSERT instead of Q_ASSERT
|
2008-12-09 15:25:01 +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 |
|