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

QmakeProjectManager: Fix possible assertion

Browse Source 
Amends 6c40fec9b0.

Change-Id: I11426f17a7e7a81bf4adcba742c6298f224b7ef1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-08-14 12:56:57 +02:00
parent 10b32863ca
commit 6e63a0757b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -1791,7 +1791,7 @@ QStringList QmakeProFile::includePaths(QtSupport::ProFileReader *reader, const F
false)) { false)) {
const QString sysrootifiedPath = sysrootify(el.fileName, sysroot.toString(), projectDir, const QString sysrootifiedPath = sysrootify(el.fileName, sysroot.toString(), projectDir,
buildDir.toString()); buildDir.toString());
if (IoUtils::exists(sysrootifiedPath)) if (IoUtils::isAbsolutePath(sysrootifiedPath) && IoUtils::exists(sysrootifiedPath))
paths << sysrootifiedPath; paths << sysrootifiedPath;
else else
tryUnfixified = true; tryUnfixified = true;
@@ -1804,7 +1804,7 @@ QStringList QmakeProFile::includePaths(QtSupport::ProFileReader *reader, const F
for (const QString &p : rawValues) { for (const QString &p : rawValues) {
const QString sysrootifiedPath = sysrootify(QDir::cleanPath(p), sysroot.toString(), const QString sysrootifiedPath = sysrootify(QDir::cleanPath(p), sysroot.toString(),
projectDir, buildDir.toString()); projectDir, buildDir.toString());
if (IoUtils::exists(sysrootifiedPath)) if (IoUtils::isAbsolutePath(sysrootifiedPath) && IoUtils::exists(sysrootifiedPath))
paths << sysrootifiedPath; paths << sysrootifiedPath;
} }
} }