Conflicts:
	doc/qt-html-templates.qdocconf

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

from Menu entry

Don't show the icon of checkable items in the menu to avoid being
affected by broken styles.

Task-number: QTCREATORBUG-1173

Reviewed-by: Thorbjørn Lindeijer
Task-number: QTCREATORBUG-865

Reviewed-by: con

Reviewed-by: con
Reviewed-by: Friedemann Kleint
Reviewed-by: dt

 - lessens open file handles
 - improves help plugin startup further

Task-number: QTCREATORBUG-337
Reviewed-by: ck

Generic highlighter: Interface for automatic download of available definitions. Refactorings and changes in related parts of the code.

Task-number: QTCREATORBUG-1621
Reviewed-by: ck

refactoring

Reviewed-by: kh1

Reviewed-by: hjk

This is improving the updating.

Reviewed-by: Marco Bubke
Task-id: QTCREATORBUG-1493

This is needed to suppert inline script function of Qml in the designer

raw strings would break things due to the missing null terminator. this
did not affect unix, as there we convert to 8 bit anyway.

Task-number: QTCREATORBUG-1364

Fixes breakage introduced by 34982c1f.
Task-number: QTCREATORBUG-1612
Reviewed-by: dt