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
kh1
0985f9c1c4
Fix ambiguity with help manager by renaming the file to match class.
...
Task-number: QTCREATORBUG-3090
Reviewed-by: ck
2010-11-16 16:25:55 +01:00
Leena Miettinen
0037296d70
Doc - Fix UI text capitalization to follow the KDE style guide.
...
Reviewed-by: dt
2010-09-15 10:30:51 +02:00
kh1
1b6ad08795
Move help manager into core.
...
- lessens open file handles
- improves help plugin startup further
Task-number: QTCREATORBUG-337
Reviewed-by: ck
2010-06-11 13:11:37 +02:00
Jens Bache-Wiig
b8f7d44753
Make the help mode more UI consistent
...
- We now used styled bars where available
- We use frameless windows to optimize screen space
- We use the fancylineedit where possible
Reviewed-by: thorbjorn
2010-05-11 14:10:04 +02:00
kh1
edcefd69ad
Implement tabless help mode, behaves now like edit mode.
2010-03-30 17:51:46 +02:00
kh1
6ac6be5db2
Rewrite of the whole help modul initialization.
...
We now do as much as possible lazy initialisation, e.g only start the
full text search indexer if we really access the search widget. Also
moved the QFutur progress into the search widget. Changed all ctors to
be called without an argument, since we share the help engines from
help manager all over the place. Make use of the fact that we only need
to call setupData on the gui engine if we access the help mode, otherwise
all data is fetched thru the core engine whichs setupData is really fast.
2010-03-23 18:13:12 +01:00
kh1
10a3699ca1
Make use of the help manager's core help engine.
2010-03-23 18:13:09 +01:00
kh1
0a1e63d1de
Make them const.
2010-03-23 18:13:05 +01:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
Friedemann Kleint
cac7f826b5
Remove static icons, cleanup.
...
Use constructor initialization, const.
2010-02-15 11:07:45 +01:00
Kai Koehne
6c4b9ba227
Reapply unconnected changes from reverted commit
...
Only revert stuff that is linked to fast string concat.
2010-02-08 11:13:55 +01:00
Kai Koehne
999c73ad9d
Revert "compile everything with QT_USE_FAST_CONCATENATION"
...
This reverts commit e70530c5ad
2010-02-08 10:56:50 +01:00
Oswald Buddenhagen
e70530c5ad
compile everything with QT_USE_FAST_CONCATENATION
2010-02-05 15:20:25 +01:00
Oswald Buddenhagen
a6ca348636
remove trailing whitespace
...
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
hjk
93cbef8724
long live the king
2009-08-14 09:30:56 +02:00
kh
86f55d7e37
Fix missing bookmark and folder icons.
2009-07-27 14:33:33 +02:00
kh
3a1cbd97a2
Sync with Assistant code.
2009-06-24 13:38:19 +02:00
Jason McDonald
884b7af769
Update license headers and sales contact details.
...
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
con
722b23189e
More fixes for setting focus correctly.
...
Reviewed-by: dt
2009-06-05 12:50:06 +02:00
Oswald Buddenhagen
d2a8449bea
ifdef Q_?S_* cleanup
...
- clear up some Q_OS_LINUX vs. Q_OS_UNIX
- clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise)
- use proper #if-#else cascades instead of free-standing #ifs
2009-06-03 20:54:59 +02:00
kh
4cb93339bd
make ctrl+lmb and mmb work in a same way everywhere (like in browsers)
2009-05-18 14:03:13 +02:00
Jure Repinc
6b1a64d5c6
A few spelling/grammar fixes
2009-05-12 10:41:36 +02:00
hjk
71a05578ae
compile fix for namespaced Qt
2009-05-07 15:57:37 +02:00
Friedemann Kleint
14e39ba5af
Fixed translation issues.
2009-05-07 15:34:52 +02:00
Friedemann Kleint
2f129dfad3
Fixed some translation errors.
2009-04-30 16:09:57 +02:00
Oswald Buddenhagen
d75c5fa220
sanitize some tr() calls
2009-02-27 20:06:08 +01:00
hjk
8ca887aae2
Fixes: change file license headers to include LGPL
2009-02-25 09:15:00 +01:00
hjk
fe0533de2a
Fixes: move all files in shared/* to src/shared/*
2009-01-26 16:19:24 +01:00
