diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp index 75c46d60f27..99dc325113e 100644 --- a/src/plugins/perfprofiler/perfprofilertool.cpp +++ b/src/plugins/perfprofiler/perfprofilertool.cpp @@ -551,9 +551,7 @@ static Utils::FileNameList collectQtIncludePaths(const ProjectExplorer::Kit *kit static Utils::FileName sysroot(const Kit *kit) { - if (kit && SysRootKitInformation::hasSysRoot(kit)) - return SysRootKitInformation::sysRoot(kit); - return Utils::FileName(); + return SysRootKitInformation::sysRoot(kit); } static Utils::FileNameList sourceFiles(const Project *currentProject = nullptr) diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index fa50794582a..16de69382e9 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -117,13 +117,6 @@ Core::Id SysRootKitInformation::id() return "PE.Profile.SysRoot"; } -bool SysRootKitInformation::hasSysRoot(const Kit *k) -{ - if (k) - return !k->value(SysRootKitInformation::id()).toString().isEmpty(); - return false; -} - Utils::FileName SysRootKitInformation::sysRoot(const Kit *k) { if (!k) diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index 2c1b55d288e..c32dbefa27c 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -60,7 +60,6 @@ public: void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override; static Core::Id id(); - static bool hasSysRoot(const Kit *k); static Utils::FileName sysRoot(const Kit *k); static void setSysRoot(Kit *k, const Utils::FileName &v); }; diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 2bc05d1335f..a014d7a758b 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -223,7 +223,7 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor QVariantMap data = defaultData; const QString sysroot = ProjectExplorer::SysRootKitInformation::sysRoot(k).toUserOutput(); - if (ProjectExplorer::SysRootKitInformation::hasSysRoot(k)) + if (!sysroot.isEmpty()) data.insert(QLatin1String(QBS_SYSROOT), sysroot); ProjectExplorer::ToolChain *tcC diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index a104775a471..4e6e11a15d4 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -684,8 +684,7 @@ QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFile * } QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k); - m_qmakeSysroot = SysRootKitInformation::hasSysRoot(k) - ? SysRootKitInformation::sysRoot(k).toString() : QString(); + m_qmakeSysroot = SysRootKitInformation::sysRoot(k).toString(); if (qtVersion && qtVersion->isValid()) { m_qmakeGlobals->qmake_abslocation = QDir::cleanPath(qtVersion->qmakeCommand().toString()); diff --git a/src/plugins/remotelinux/deploymenttimeinfo.cpp b/src/plugins/remotelinux/deploymenttimeinfo.cpp index 31a4c22eefc..d3b9dcee611 100644 --- a/src/plugins/remotelinux/deploymenttimeinfo.cpp +++ b/src/plugins/remotelinux/deploymenttimeinfo.cpp @@ -88,9 +88,7 @@ public: QString host; if (kit) { - if (SysRootKitInformation::hasSysRoot(kit)) - systemRoot = SysRootKitInformation::sysRoot(kit).toString(); - + systemRoot = SysRootKitInformation::sysRoot(kit).toString(); const IDevice::ConstPtr deviceConfiguration = DeviceKitInformation::device(kit); host = deviceConfiguration->sshParameters().host(); }