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

Done-with: Daniel Molkentin

%1 contains the error message, not the hostname.
Other typos fixed as well.

Reviewed-by: ossi

- Make sure file names are completely visible.
- Show hidden files.
- Pre-unselect files of types unlikely to be included in the package.

Merge-request: 228
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Add options to break on Cpp Exceptions, thread creation, etc.

Task-number: QTCREATORBUG-3349

Also take over symbol path of the old CDB engine on
auto-detect.

Task-number: QTCREATORBUG-3343

The build server does not like CRLF.

This should help people realize they need to explicitly request
upload rights.

Task-number: QTCREATORBUG-3342

The proper fix would be to support the QMAKE_SUBSTITUTES variable.

Apparently, we can't delete read-only files.

Task-number: QTCREATORBUG-3343

Instead of duplicating the code from QmlEditorWigets we now subclass
and expose the gradient editing to qml.
The adaptor class is called GradientLineQmlAdaptor.

Clean up status messages logged in the debugger log.

We're trying multiple times to connect, and it's just normal that
the first tries will fail (because the app isn't initialized yet),
so don't log it as a warning.

Introduce new Symbol group node for fake map nodes.
Iterate over QHash and extract keys, values for QSet/QHash.

Removing unused files.