diff --git a/src/plugins/android/androidgdbserverkitinformation.cpp b/src/plugins/android/androidgdbserverkitinformation.cpp
index 06baec3a073..1387e60be20 100644
--- a/src/plugins/android/androidgdbserverkitinformation.cpp
+++ b/src/plugins/android/androidgdbserverkitinformation.cpp
@@ -98,8 +98,7 @@ bool AndroidGdbServerKitAspect::isApplicableToKit(const Kit *k) const
KitAspect::ItemList AndroidGdbServerKitAspect::toUserOutput(const Kit *kit) const
{
- return KitAspect::ItemList()
- << qMakePair(tr("GDB server"), AndroidGdbServerKitAspect::gdbServer(kit).toUserOutput());
+ return {{tr("GDB server"), AndroidGdbServerKitAspect::gdbServer(kit).toUserOutput()}};
}
KitAspectWidget *AndroidGdbServerKitAspect::createConfigWidget(Kit *kit) const
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index b3aa6f3ccc9..fa4d26fc2e1 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -275,7 +275,7 @@ void CMakeKitAspect::fix(Kit *k)
KitAspect::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const
{
const CMakeTool *const tool = cmakeTool(k);
- return ItemList() << qMakePair(tr("CMake"), tool ? tool->displayName() : tr("Unconfigured"));
+ return {{tr("CMake"), tool ? tool->displayName() : tr("Unconfigured")}};
}
KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const
@@ -755,7 +755,7 @@ KitAspect::ItemList CMakeGeneratorKitAspect::toUserOutput(const Kit *k) const
if (!info.toolset.isEmpty())
message += "
" + tr("Toolset: %1").arg(info.toolset);
}
- return ItemList() << qMakePair(tr("CMake Generator"), message);
+ return {{tr("CMake Generator"), message}};
}
KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const
@@ -1063,8 +1063,7 @@ void CMakeConfigurationKitAspect::fix(Kit *k)
KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const
{
- const QStringList current = toStringList(k);
- return ItemList() << qMakePair(tr("CMake Configuration"), current.join(QLatin1String("
")));
+ return {{tr("CMake Configuration"), toStringList(k).join("
")}};
}
KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const
diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index f0877338153..39a14097ff2 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -418,7 +418,7 @@ void DebuggerKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) co
KitAspect::ItemList DebuggerKitAspect::toUserOutput(const Kit *k) const
{
- return ItemList() << qMakePair(tr("Debugger"), displayString(k));
+ return {{tr("Debugger"), displayString(k)}};
}
DebuggerEngineType DebuggerKitAspect::engineType(const Kit *k)
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index 500d8afd5bf..ed3be721e03 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -156,7 +156,7 @@ KitAspectWidget *SysRootKitAspect::createConfigWidget(Kit *k) const
KitAspect::ItemList SysRootKitAspect::toUserOutput(const Kit *k) const
{
- return ItemList() << qMakePair(tr("Sys Root"), sysRoot(k).toUserOutput());
+ return {{tr("Sys Root"), sysRoot(k).toUserOutput()}};
}
void SysRootKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const
@@ -524,7 +524,7 @@ QString ToolChainKitAspect::displayNamePostfix(const Kit *k) const
KitAspect::ItemList ToolChainKitAspect::toUserOutput(const Kit *k) const
{
ToolChain *tc = toolChain(k, Constants::CXX_LANGUAGE_ID);
- return ItemList() << qMakePair(tr("Compiler"), tc ? tc->displayName() : tr("None"));
+ return {{tr("Compiler"), tc ? tc->displayName() : tr("None")}};
}
void ToolChainKitAspect::addToEnvironment(const Kit *k, Utils::Environment &env) const
@@ -830,7 +830,7 @@ KitAspect::ItemList DeviceTypeKitAspect::toUserOutput(const Kit *k) const
if (IDeviceFactory *factory = IDeviceFactory::find(type))
typeDisplayName = factory->displayName();
}
- return ItemList() << qMakePair(tr("Device type"), typeDisplayName);
+ return {{tr("Device type"), typeDisplayName}};
}
const Core::Id DeviceTypeKitAspect::id()
@@ -1020,7 +1020,7 @@ QString DeviceKitAspect::displayNamePostfix(const Kit *k) const
KitAspect::ItemList DeviceKitAspect::toUserOutput(const Kit *k) const
{
IDevice::ConstPtr dev = device(k);
- return ItemList() << qMakePair(tr("Device"), dev.isNull() ? tr("Unconfigured") : dev->displayName());
+ return {{tr("Device"), dev.isNull() ? tr("Unconfigured") : dev->displayName()}};
}
void DeviceKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const
diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp
index 93fad8c08c2..3319aa732a0 100644
--- a/src/plugins/qtsupport/qtkitinformation.cpp
+++ b/src/plugins/qtsupport/qtkitinformation.cpp
@@ -229,7 +229,7 @@ ProjectExplorer::KitAspect::ItemList
QtKitAspect::toUserOutput(const ProjectExplorer::Kit *k) const
{
BaseQtVersion *version = qtVersion(k);
- return ItemList() << qMakePair(tr("Qt version"), version ? version->displayName() : tr("None"));
+ return {{tr("Qt version"), version ? version->displayName() : tr("None")}};
}
void QtKitAspect::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const