Some QString -> FileName transformation

Change-Id: I4a8a8f68bb1e52750380218793ec3029b488c01f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index afd6952e23..caea364733 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -596,8 +596,8 @@ QList<FileName> GccToolChain::suggestedMkspecList() const
 QString GccToolChain::makeCommand(const Utils::Environment &environment) const
 {
     QString make = QLatin1String("make");
-    QString tmp = environment.searchInPath(make);
-    return tmp.isEmpty() ? make : tmp;
+    FileName tmp = environment.searchInPath(make);
+    return tmp.isEmpty() ? make : tmp.toString();
 }
 
 IOutputParser *GccToolChain::outputParser() const
@@ -809,7 +809,7 @@ QList<ToolChain *> GccToolChainFactory::autoDetectToolchains(const QString &comp
     QList<ToolChain *> result;
 
     Environment systemEnvironment = Environment::systemEnvironment();
-    const FileName compilerPath = FileName::fromString(systemEnvironment.searchInPath(compiler));
+    const FileName compilerPath = systemEnvironment.searchInPath(compiler);
     if (compilerPath.isEmpty())
         return result;
 
@@ -1023,11 +1023,11 @@ QString ClangToolChain::makeCommand(const Utils::Environment &environment) const
         makes << QLatin1String("make");
     }
 
-    QString tmp;
+    FileName tmp;
     foreach (const QString &make, makes) {
         tmp = environment.searchInPath(make);
         if (!tmp.isEmpty())
-            return tmp;
+            return tmp.toString();
     }
     return makes.first();
 }
@@ -1188,11 +1188,11 @@ QString MingwToolChain::makeCommand(const Utils::Environment &environment) const
         makes << QLatin1String("make");
     }
 
-    QString tmp;
+    FileName tmp;
     foreach (const QString &make, makes) {
         tmp = environment.searchInPath(make);
         if (!tmp.isEmpty())
-            return tmp;
+            return tmp.toString();
     }
     return makes.first();
 }