diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp
index a147df4a6ba..b17c240a469 100644
--- a/src/plugins/qnx/qnxconfiguration.cpp
+++ b/src/plugins/qnx/qnxconfiguration.cpp
@@ -264,7 +264,7 @@ QnxConfiguration::QnxToolChainMap QnxConfiguration::createToolChain(const Target
         toolChain->resetToolChain(qccCompilerPath());
         ToolChainManager::registerToolChain(toolChain);
 
-        toolChainMap.insert(std::make_pair(language, toolChain));
+        toolChainMap.insert({language, toolChain});
     }
 
     return toolChainMap;
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 8b2115f7c1d..ada5f3c842e 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -629,14 +629,14 @@ void QtOptionsPageWidget::addQtDir()
     if (BuildableHelperLibrary::isQtChooser(qtVersion))
         qtVersion = BuildableHelperLibrary::qtChooserToQmakePath(qtVersion.symLinkTarget());
 
-    auto checkAlreadyExists = [qtVersion](TreeItem *parent) {
+    auto checkAlreadyExists = [qtVersion](TreeItem *parent) -> QPair<bool, QString> {
         for (int i = 0; i < parent->childCount(); ++i) {
             auto item = static_cast<QtVersionItem *>(parent->childAt(i));
             if (item->version()->qmakeFilePath() == qtVersion) {
-                return std::make_pair(true, item->version()->displayName());
+                return {true, item->version()->displayName()};
             }
         }
-        return std::make_pair(false, QString());
+        return {false, {}};
     };
 
     bool alreadyExists;
diff --git a/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp b/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp
index e7959540f21..45d5f51577e 100644
--- a/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp
+++ b/tests/auto/qml/codemodel/importscheck/tst_importscheck.cpp
@@ -311,13 +311,13 @@ void tst_ImportCheck::moduleMapping_data()
     QTest::newRow("check that QtQuick controls cannot be found with a mapping")
             << QString(TESTSRCDIR "/moduleMapping/importQtQuick.qml")
             << QString(TESTSRCDIR "/moduleMapping")
-            << StrStrHash({ std::make_pair(QStringLiteral("QtQuick.Controls"), QStringLiteral("MyControls")) })
+            << StrStrHash({{QStringLiteral("QtQuick.Controls"), QStringLiteral("MyControls")}})
             << QStringList({ "Item", "Button" })
             << false;
     QTest::newRow("check that custom controls can be found with a mapping")
             << QString(TESTSRCDIR "/moduleMapping/importQtQuick.qml")
             << QString(TESTSRCDIR "/moduleMapping")
-            << StrStrHash({ std::make_pair(QStringLiteral("QtQuick.Controls"), QStringLiteral("MyControls")) })
+            << StrStrHash({{QStringLiteral("QtQuick.Controls"), QStringLiteral("MyControls")}})
             << QStringList({ "Item", "Oblong" })  // item is in QtQuick, and should still be found, as only
                                                   // the QtQuick.Controls are redirected
             << true;