Merge remote-tracking branch 'origin/3.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e

src/plugins/clearcase/clearcaseplugin.cpp

@@ -230,7 +230,7 @@ QString ClearCasePlugin::getDriveLetterOfPath(const QString &directory)
 {
     // cdUp until we get just the drive letter
     QDir dir(directory);
-    while (dir.cdUp())
+    while (!dir.isRoot() && dir.cdUp())
     { }
 
     return dir.path();