Merge remote-tracking branch 'origin/3.2'

Conflicts:
	src/plugins/git/gerrit/gerritparameters.cpp
	src/plugins/git/gerrit/gerritplugin.h
	src/plugins/git/gitclient.cpp

Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec

1 files changed, 4 insertions, 4 deletions

diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index 1cce9ffb1b..a405c71aee 100644
--- a/src/libs/utils/buildablehelperlibrary.cpp
+++ b/src/libs/utils/buildablehelperlibrary.cpp
@@ -64,7 +64,7 @@ QString BuildableHelperLibrary::qtChooserToQmakePath(const QString &path)
     return result;
 }
 
-Utils::FileName BuildableHelperLibrary::findSystemQt(const Utils::Environment &env)
+FileName BuildableHelperLibrary::findSystemQt(const Environment &env)
 {
     QStringList paths = env.path();
     foreach (const QString &path, paths) {
@@ -78,11 +78,11 @@ Utils::FileName BuildableHelperLibrary::findSystemQt(const Utils::Environment &e
                     qmake.setFile(qtChooserToQmakePath(qmake.symLinkTarget()));
 
                 if (!qtVersionForQMake(qmake.absoluteFilePath()).isNull())
-                    return Utils::FileName(qmake);
+                    return FileName(qmake);
             }
         }
     }
-    return Utils::FileName();
+    return FileName();
 }
 
 QString BuildableHelperLibrary::qtVersionForQMake(const QString &qmakePath)
@@ -105,7 +105,7 @@ QString BuildableHelperLibrary::qtVersionForQMake(const QString &qmakePath, bool
         return QString();
     }
     if (!qmake.waitForFinished())      {
-        Utils::SynchronousProcess::stopProcess(qmake);
+        SynchronousProcess::stopProcess(qmake);
         qWarning("Timeout running '%s'.", qPrintable(qmakePath));
         return QString();
     }