Broke in f14c50da

 * Accidentally included a header not ready to commit yet.

OS

metatype redefinition

Check for the case that a new file to be added to a .qmlproject
is also automatically covered e.g. by a wildcard filter. In this
case we don't have to do anything.

Done-with: Roberto Raggi <roberto.raggi@nokia.com>

The old code still assumed the old, plain text format, and just added
the file path to the end of the file. This broke the new .qmlproject
file format.

Ideally QmlProject should be clever enough to check whether the file
will be automatically picked up in the monitored directories, and if
not added explicitly e.g. to QmlFiles { paths: ... }. Anyhow, this
quick fix just shows every time an error message instead of destroying
the .qmlproject file.

call of overloaded ‘QString(int)’ is ambiguous

Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.h

Task-number: BAUHAUS-204
Task-number: BAUHAUS-207
Task-number: BAUHAUS-339
Task-number: BAUHAUS-365
Task-number: BAUHAUS-374
Reviewed-by: kkoehne

Conflicts:
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlproject.h