diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt
index 9145a298c9..475c7b8327 100644
--- a/src/qmltyperegistrar/CMakeLists.txt
+++ b/src/qmltyperegistrar/CMakeLists.txt
@@ -8,6 +8,7 @@ qt_get_tool_target_name(target_name qmltyperegistrar)
 qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Types Registrar"
     TOOLS_TARGET Qml # special case
+    INSTALL_DIR "${INSTALL_LIBEXECDIR}"
     SOURCES
         ../qmlcompiler/qqmljsstreamwriter.cpp ../qmlcompiler/qqmljsstreamwriter_p.h
         metatypesjsonprocessor.cpp metatypesjsonprocessor.h
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf
index 74e841e29c..2c6e474a21 100644
--- a/src/qmltyperegistrar/qmltypes.prf
+++ b/src/qmltyperegistrar/qmltypes.prf
@@ -1,6 +1,6 @@
 CONFIG += metatypes
 
-qtPrepareTool(QML_TYPEREGISTRAR, qmltyperegistrar)
+qtPrepareLibExecTool(QML_TYPEREGISTRAR, qmltyperegistrar)
 
 isEmpty(QML_IMPORT_VERSION): \
     QML_IMPORT_VERSION = $$IMPORT_VERSION
diff --git a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
index 9cce35aaf0..02f0ea95a2 100644
--- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
+++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
@@ -107,7 +107,8 @@ static bool generateCache(const QString &qmlFileName, QByteArray *capturedStderr
     QProcess proc;
     if (capturedStderr == nullptr)
         proc.setProcessChannelMode(QProcess::ForwardedChannels);
-    proc.setProgram(QLibraryInfo::path(QLibraryInfo::BinariesPath) + QDir::separator() + QLatin1String("qmlcachegen"));
+    proc.setProgram(QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+                    + QLatin1String("/qmlcachegen"));
     proc.setArguments(QStringList() << qmlFileName);
     proc.start();
     if (!proc.waitForFinished())
diff --git a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
index ca11d00915..5b8b92748a 100644
--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
@@ -55,7 +55,8 @@ private:
 void TestQmlimportscanner::initTestCase()
 {
     QQmlDataTest::initTestCase();
-    m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlimportscanner");
+    m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+            + QLatin1String("/qmlimportscanner");
 #ifdef Q_OS_WIN
     m_qmlimportscannerPath += QLatin1String(".exe");
 #endif
diff --git a/tests/auto/qml/qmllint/tst_qmllint.cpp b/tests/auto/qml/qmllint/tst_qmllint.cpp
index 48e4210f9c..742a6a3c7f 100644
--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
+++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
@@ -82,8 +82,10 @@ void TestQmllint::initTestCase()
 {
     QQmlDataTest::initTestCase();
     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
-    m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmljsrootgen");
-    m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmltyperegistrar");
+    m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+            + QLatin1String("/qmljsrootgen");
+    m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+            + QLatin1String("/qmltyperegistrar");
 #ifdef Q_OS_WIN
     m_qmllintPath += QLatin1String(".exe");
     m_qmljsrootgenPath += QLatin1String(".exe");
diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt
index e0ae4c4092..8739992dd7 100644
--- a/tools/qmlcachegen/CMakeLists.txt
+++ b/tools/qmlcachegen/CMakeLists.txt
@@ -8,6 +8,7 @@ qt_get_tool_target_name(target_name qmlcachegen)
 qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Cache Generator"
     TOOLS_TARGET Qml # special case
+    INSTALL_DIR "${INSTALL_LIBEXECDIR}"
     SOURCES
         qmlcachegen.cpp
     DEFINES
diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
index 537eaf62ea..0f0d291dfd 100644
--- a/tools/qmlcachegen/qmlcache.prf
+++ b/tools/qmlcachegen/qmlcache.prf
@@ -3,7 +3,7 @@ static {
     return()
 }
 
-qtPrepareTool(QML_CACHEGEN, qmlcachegen, _ARCH_CHECK)
+qtPrepareLibExecTool(QML_CACHEGEN, qmlcachegen, _ARCH_CHECK)
 
 isEmpty(TARGETPATH): error("Must set TARGETPATH (QML import name) for ahead-of-time QML cache generation")
 
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf
index 0b88fba86e..262ed08785 100644
--- a/tools/qmlcachegen/qtquickcompiler.prf
+++ b/tools/qmlcachegen/qtquickcompiler.prf
@@ -10,7 +10,7 @@ if(qtc_run|lupdate_run): return()
     unset(qt_modules)
 }
 
-qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER)
+qtPrepareLibExecTool(QML_CACHEGEN, qmlcachegen, _FILTER)
 qtPrepareLibExecTool(QMAKE_RCC, rcc, _DEP)
 
 isEmpty(QMLCACHE_DIR): QMLCACHE_DIR = .
diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt
index 61e927b6fe..eb00026bc1 100644
--- a/tools/qmlimportscanner/CMakeLists.txt
+++ b/tools/qmlimportscanner/CMakeLists.txt
@@ -8,6 +8,7 @@ qt_get_tool_target_name(target_name qmlimportscanner)
 qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Import Scanner"
     TOOLS_TARGET Qml # special case
+    INSTALL_DIR "${INSTALL_LIBEXECDIR}"
     SOURCES
         main.cpp
     DEFINES
diff --git a/tools/qmljsrootgen/CMakeLists.txt b/tools/qmljsrootgen/CMakeLists.txt
index 5126f6f091..357000b969 100644
--- a/tools/qmljsrootgen/CMakeLists.txt
+++ b/tools/qmljsrootgen/CMakeLists.txt
@@ -2,6 +2,7 @@ qt_get_tool_target_name(target_name qmljsrootgen)
 qt_internal_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Global Object Metatypes Generator"
     TOOLS_TARGET Qml # special case
+    INSTALL_DIR "${INSTALL_LIBEXECDIR}"
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES