Merge remote-tracking branch 'origin/3.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e

src/plugins/cvs/cvsplugin.cpp

@@ -1245,7 +1245,9 @@ bool CvsPlugin::managesDirectory(const QString &directory, QString *topLevel /*
          * not have a  "CVS" directory. The starting directory must be a managed
          * one. Go up and try to find the first unmanaged parent dir. */
         QDir lastDirectory = dir;
-        for (QDir parentDir = lastDirectory; parentDir.cdUp() ; lastDirectory = parentDir) {
+        for (QDir parentDir = lastDirectory;
+             !parentDir.isRoot() && parentDir.cdUp();
+             lastDirectory = parentDir) {
             if (!checkCVSDirectory(parentDir)) {
                 *topLevel = lastDirectory.absolutePath();
                 break;