summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2011-03-25 17:20:27 +0100
committerdt <qtc-committer@nokia.com>2011-03-25 17:22:04 +0100
commit3a75137acd7f11a975a19041688612fba1900cf7 (patch)
treec6df6710fe469920c4444221cde508f14ad6b9ba /src/plugins
parent1e8a783abbf0f1d8032b9db3d5388115dcfa1161 (diff)
downloadqt-creator-3a75137acd7f11a975a19041688612fba1900cf7.tar.gz
Qt4Project: Don't show a error on initial building
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/qt4projectmanager/makestep.cpp10
-rw-r--r--src/plugins/qt4projectmanager/makestep.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 4c6c084ce3..6b058fe270 100644
--- 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 6a5a030899..74be8b820b 100644
--- 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;