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

CompilationDBProjectManager: Handle relative sysroot

Browse Source 
Fixes: QTCREATORBUG-22388
Change-Id: I030b105897bd483c17aaf86229d4515b2dd747d3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Christian Kandeler
2019-05-27 16:59:00 +02:00
parent 77d2cebc12
commit e6bda58033
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp
View File

@@ -186,7 +186,7 @@ void filteredFlags(const QString &fileName,
if (flag.startsWith("--sysroot=")) { if (flag.startsWith("--sysroot=")) {
if (sysRoot.isEmpty()) if (sysRoot.isEmpty())
sysRoot = flag.mid(10); sysRoot = updatedPathFlag(flag.mid(10), workingDir);
continue; continue;
} }

6
tests/unit/unittest/compilationdatabaseutils-test.cpp
View File

@@ -97,7 +97,8 @@ TEST_F(CompilationDatabaseUtils, FilterArguments)
QString::fromUtf8(HostOsInfo::isWindowsHost() ? winPath2 : otherPath2), QString::fromUtf8(HostOsInfo::isWindowsHost() ? winPath2 : otherPath2),
"-x", "-x",
"c++", "c++",
"--sysroot=C:\\sysroot\\embedded", QString("--sysroot=") + (HostOsInfo::isWindowsHost()
? "C:\\sysroot\\embedded" : "/opt/sysroot/embedded"),
"C:\\qt-creator\\src\\plugins\\cpptools\\compileroptionsbuilder.cpp"}, "C:\\qt-creator\\src\\plugins\\cpptools\\compileroptionsbuilder.cpp"},
"compileroptionsbuilder"); "compileroptionsbuilder");
@@ -120,7 +121,8 @@ TEST_F(CompilationDatabaseUtils, FilterArguments)
{"RELATIVE_PLUGIN_PATH", "\"../lib/qtcreator/plugins\""}, {"RELATIVE_PLUGIN_PATH", "\"../lib/qtcreator/plugins\""},
{"QT_CREATOR", "1"}})); {"QT_CREATOR", "1"}}));
ASSERT_THAT(fileKind, CppTools::ProjectFile::Kind::CXXSource); ASSERT_THAT(fileKind, CppTools::ProjectFile::Kind::CXXSource);
ASSERT_THAT(sysRoot, QString("C:\\sysroot\\embedded")); ASSERT_THAT(sysRoot, HostOsInfo::isWindowsHost() ? QString("C:\\sysroot\\embedded")
: QString("/opt/sysroot/embedded"));
} }
static QString kCmakeCommand static QString kCmakeCommand