Qt4Project: Don't show a error on initial building

diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 4c6c084..6b058fe 100644 (file)
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -171,17 +171,17 @@ bool MakeStep::init()
         if(!makefile.isEmpty()) {
             Utils::QtcProcess::addArg(&args, QLatin1String("-f"));
             Utils::QtcProcess::addArg(&args, makefile);
-            m_makeFileExists = QDir(workingDirectory).exists(makefile);
+            m_makeFileToCheck = QDir(workingDirectory).filePath(makefile);
         } else {
-            m_makeFileExists = QDir(workingDirectory).exists("Makefile");
+            m_makeFileToCheck = QDir(workingDirectory).filePath("Makefile");
         }
     } else {
         if (!bc->makefile().isEmpty()) {
             Utils::QtcProcess::addArg(&args, QLatin1String("-f"));
             Utils::QtcProcess::addArg(&args, bc->makefile());
-            m_makeFileExists = QDir(workingDirectory).exists(bc->makefile());
+            m_makeFileToCheck = QDir(workingDirectory).filePath(bc->makefile());
         } else {
-            m_makeFileExists = QDir(workingDirectory).exists("Makefile");
+            m_makeFileToCheck = QDir(workingDirectory).filePath("Makefile");
         }
     }
 
@@ -224,7 +224,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
         return;
     }
 
-    if (!m_makeFileExists) {
+    if (!QFileInfo(m_makeFileToCheck).exists()) {
         if (!m_clean)
             emit addOutput(tr("Makefile not found. Please check your build settings"), BuildStep::MessageOutput);
         fi.reportResult(m_clean);

diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index 6a5a030..74be8b8 100644 (file)
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -115,7 +115,7 @@ protected:
 private:
     void ctor();
     bool m_clean;
-    bool m_makeFileExists;
+    QString m_makeFileToCheck;
     QString m_userArgs;
     QString m_makeCmd;
     QList<ProjectExplorer::Task> m_tasks;