From 0db9df280631b50e366eb8c21697cd849a60dbaf Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 1 Mar 2018 18:35:29 +0100 Subject: [PATCH] Compile fix: Don't use Utils::FileName's private constructor error: C2248: 'Utils::FileName::FileName': cannot access private member declared in class 'Utils::FileName' Change-Id: I0d7169170d4c360fce038c43c6572acc6760bddf Reviewed-by: Oswald Buddenhagen Reviewed-by: Orgad Shaneh --- src/plugins/debugger/debuggerkitinformation.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakekitinformation.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index bc37572a3d3..9f723d70c30 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -114,7 +114,7 @@ void DebuggerKitInformation::setup(Kit *k) // This improves the situation a bit if a cross-compilation tool chain has the // same ABI as the host. if (level == DebuggerItem::MatchesPerfectly - && systemEnvironment.path().contains(item.command().parentDir().toString())) { + && systemEnvironment.path().contains(item.command().parentDir())) { level = DebuggerItem::MatchesPerfectlyInPath; } } else if (rawId.type() == QVariant::String) { diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index 8573bbc7a16..000a7741935 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -103,7 +103,7 @@ void QmakeKitInformation::setup(Kit *k) const Environment systemEnvironment = Environment::systemEnvironment(); ToolChain *bestTc = Utils::findOrDefault(goodTcs, [&systemEnvironment](const ToolChain *t) { - return systemEnvironment.path().contains(t->compilerCommand().parentDir().toString()); + return systemEnvironment.path().contains(t->compilerCommand().parentDir()); }); if (!bestTc) { bestTc = goodTcs.isEmpty() ? possibleTcs.last() : goodTcs.last();