Erik Verbruggen
05639e4688
Merge branch 'origin/2.0' (early part)
2010-06-15 11:30:51 +02:00
kh1
27daa542d3
We need to check for http only.
2010-06-14 16:57:52 +02:00
kh1
7d4bbf4934
Allow http request to be opened in the help plugin.
...
Reviewed-by: ck
2010-06-14 14:34:32 +02:00
con
30fae3eab1
Merge remote branch 'origin/2.0'
...
Conflicts:
doc/qtcreator.qdoc
src/plugins/projectexplorer/taskwindow.h
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
src/plugins/qmljseditor/qmljshoverhandler.h
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/subversion/subversionplugin.cpp
2010-06-11 16:30:39 +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
kh1
284fc63236
Backport some Qt Assistant print fixes.
...
Reviewed-by: ck
2010-06-01 13:15:07 +02:00
kh1
b0f9b1d491
We need to check for namespace nokia too.
...
Reviewed-by: ck
2010-04-28 15:07:05 +02:00
kh1
d086f76038
Improved workaround for new qt documentation, base on dboddie's work.
...
Make the check more generic, to also work for all other Qt namespaces
than qt.ver.s.ion. Still there's something broken in Qt webkit or so.
Reviewed-by: ck
2010-04-23 12:20:21 +02:00
kh1
342e621253
Quick fix to make the documentation work, needs a proper solution though.
...
Reviewed-by: kh
2010-04-19 19:08:51 +02:00
Oswald Buddenhagen
7400513695
fix compile with gcc: namespace friend class declaration
2010-03-30 18:40:35 +02:00
kh1
a8801d15c5
Implement text highlight support after full text search.
2010-03-30 17:51:45 +02:00
kh1
6ea66ca3bd
Implement a common interface for help viewers.
...
Both implementations are now split into two source files, based on the
base class type. They share also a commen implementation, but the class
interface looks now clean to the outside. Adopt other classes for use.
2010-03-30 17:51:44 +02:00
