From 6e63a0757b44ae8bd42da83a682c244bfc387e25 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 14 Aug 2019 12:56:57 +0200 Subject: [PATCH] QmakeProjectManager: Fix possible assertion Amends 6c40fec9b0. Change-Id: I11426f17a7e7a81bf4adcba742c6298f224b7ef1 Reviewed-by: hjk --- src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index b361b5f104a..85d6d4a7c23 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -1791,7 +1791,7 @@ QStringList QmakeProFile::includePaths(QtSupport::ProFileReader *reader, const F false)) { const QString sysrootifiedPath = sysrootify(el.fileName, sysroot.toString(), projectDir, buildDir.toString()); - if (IoUtils::exists(sysrootifiedPath)) + if (IoUtils::isAbsolutePath(sysrootifiedPath) && IoUtils::exists(sysrootifiedPath)) paths << sysrootifiedPath; else tryUnfixified = true; @@ -1804,7 +1804,7 @@ QStringList QmakeProFile::includePaths(QtSupport::ProFileReader *reader, const F for (const QString &p : rawValues) { const QString sysrootifiedPath = sysrootify(QDir::cleanPath(p), sysroot.toString(), projectDir, buildDir.toString()); - if (IoUtils::exists(sysrootifiedPath)) + if (IoUtils::isAbsolutePath(sysrootifiedPath) && IoUtils::exists(sysrootifiedPath)) paths << sysrootifiedPath; } }