diff --git a/common/shlibs b/common/shlibs
index af78faa086a..10a1233b9c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2075,10 +2075,10 @@ libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
 libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
 libQt6Charts.so.6 qt6-charts-6.1.0rc2_1
-libQt6Designer.so.6 qt6-tools-6.1.0_1
-libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
-libQt6Help.so.6 qt6-tools-6.1.0_1
-libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Designer.so.6 qt6-designer-6.4.2_1
+libQt6DesignerComponents.so.6 qt6-designer-6.4.2_1
+libQt6Help.so.6 qt6-help-6.4.2_1
+libQt6UiTools.so.6 qt6-ui-tools-6.4.2_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
diff --git a/srcpkgs/qt6-designer b/srcpkgs/qt6-designer
new file mode 120000
index 00000000000..d2de59aba45
--- /dev/null
+++ b/srcpkgs/qt6-designer
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-help b/srcpkgs/qt6-help
new file mode 120000
index 00000000000..d2de59aba45
--- /dev/null
+++ b/srcpkgs/qt6-help
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/patches/no-litehtml-test.patch b/srcpkgs/qt6-tools/patches/no-litehtml-test.patch
new file mode 100644
index 00000000000..2cbfac5de82
--- /dev/null
+++ b/srcpkgs/qt6-tools/patches/no-litehtml-test.patch
@@ -0,0 +1,11 @@
+--- qt6-tools-6.4.2.orig/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
++++ qt6-tools-6.4.2/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
+@@ -191,7 +191,7 @@ set_source_files_properties(${CMAKE_CURR
+ 
+ # Tests
+ 
+-if (BUILD_TESTING)
++if (FALSE)
+     include(FetchContent)
+     FetchContent_Declare(
+       googletest
diff --git a/srcpkgs/qt6-tools/patches/qdoc-location.patch b/srcpkgs/qt6-tools/patches/qdoc-location.patch
new file mode 100644
index 00000000000..6d7c0ea3453
--- /dev/null
+++ b/srcpkgs/qt6-tools/patches/qdoc-location.patch
@@ -0,0 +1,14 @@
+--- qt6-tools-6.4.2.orig/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp
++++ qt6-tools-6.4.2/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp
+@@ -74,7 +74,10 @@ private:
+ void tst_generatedOutput::initTestCase()
+ {
+     // Build the path to the QDoc binary the same way moc tests do for moc.
+-    const auto binpath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++    auto binpath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++    char *build_binpath = getenv("QT_BUILD_BIN_PATH");
++    if (build_binpath && *build_binpath)
++    	    binpath = build_binpath;
+     const auto extension = QSysInfo::productType() == "windows" ? ".exe" : "";
+     m_qdoc = binpath + QLatin1String("/qdoc") + extension;
+     m_expectedDir.setPath(QFINDTESTDATA("expected_output"));
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index 755d2e96ea6..cdbb96b4351 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,26 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.4.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
- -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
-hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
-makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite
- gumbo-parser-devel icu-devel"
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON
+ -DQT_FEATURE_pixeltool=ON
+ -DQT_FEATURE_distancefieldgenerator=ON"
+hostmakedepends="qt6-base perl qt6-plugin-sqlite clang llvm clang-tools-extra
+ qt6-declarative-host-tools"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite qt6-declarative-devel
+ gumbo-parser-devel icu-devel llvm clang-tools-extra"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=97f3d5f88c458be7a8f7b7b08efc06c4ebad39ca51669476b18bf9e4c11afba2
+checksum=a31387916184e4a5ef522d3ea841e8e931cc0f88be0824a7a354a572d5826c68
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DQT_FORCE_BUILD_TOOLS=TRUE"
-	hostmakedepends+=" qt6-tools-devel"
+	hostmakedepends+=" qt6-tools"
 fi
 
 
@@ -31,22 +34,50 @@ post_build() {
 
 do_check() {
 	cd build
+	export QT_BUILD_BIN_PATH=$wrksrc/build/lib/qt6/bin
 	# Some of these tests expect that qt6-tools is already
 	# installed in /usr/lib/qt6
 	ctest -E 'tst_(lrelease|lconvert|lupdate|qtattributionsscanner|qhelpcontentmodel|qhelpenginecore|qhelpgenerator|qhelpindexmode)'
 }
 
+qt6-help_package() {
+	short_desc+=" - Help libraries"
+	pkg_install() {
+		vmove "usr/lib/libQt6Help.so.*"
+	}
+}
+
+qt6-designer_package() {
+	short_desc+=" - Designer libraries"
+	pkg_install() {
+		vmove "usr/lib/libQt6Designer*.so.*"
+	}
+}
+
+qt6-ui-tools_package() {
+	short_desc+=" - UI Tools libraries"
+	pkg_install() {
+		vmove "usr/lib/libQt6UiTools.so.*"
+	}
+}
+
 qt6-tools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
 	short_desc+=" - development files"
 	pkg_install() {
+		local _f
 		vmove usr/include
-		vmove usr/lib/cmake
 		vmove usr/lib/metatypes
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
 		vmove usr/share/qt6/modules
+		for _f in ${DESTDIR}/usr/lib/cmake/*; do
+			case "$_f" in
+			*ToolsTools|*/Qt6LinguistTools) ;;
+			*)	vmove "usr/lib/cmake/${_f##*/}" ;;
+			esac
+		done
 	}
 }
diff --git a/srcpkgs/qt6-ui-tools b/srcpkgs/qt6-ui-tools
new file mode 120000
index 00000000000..d2de59aba45
--- /dev/null
+++ b/srcpkgs/qt6-ui-tools
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file