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

Don't parse Makefiles without Command: line

Browse Source 
Change-Id: Ied315fda07d2ae8910aca7ce232b01c5cdc36f0f
Task-number: QTCREATORBUG-14291
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-07-24 16:16:35 +02:00
parent eba7d8d196
commit fb1360cd31
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
View File

@@ -92,6 +92,8 @@ QList<BuildInfo *> QmakeProjectImporter::import(const FileName &importPath, bool
// find interesting makefiles // find interesting makefiles
QString makefile = importPath.toString() + QLatin1Char('/') + file; QString makefile = importPath.toString() + QLatin1Char('/') + file;
MakeFileParse parse(makefile); MakeFileParse parse(makefile);
if (parse.makeFileState() != MakeFileParse::Okay)
continue;
QFileInfo qmakeFi = parse.qmakePath().toFileInfo(); QFileInfo qmakeFi = parse.qmakePath().toFileInfo();
FileName canonicalQmakeBinary = FileName::fromString(qmakeFi.canonicalFilePath()); FileName canonicalQmakeBinary = FileName::fromString(qmakeFi.canonicalFilePath());
if (canonicalQmakeBinary.isEmpty()) { if (canonicalQmakeBinary.isEmpty()) {