feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qt4Project: Don't show a error on initial building

Browse Source
This commit is contained in:
dt
2011-03-25 17:20:27 +01:00
parent 1e8a783abb
commit 3a75137acd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -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);