diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 102b7e40c07..0edbb7ec7d0 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -3,16 +3,15 @@ pkgname=qtcreator
 version=11.0.1
 revision=1
 build_style=cmake
-configure_args="$(vopt_bool qbs BUILD_QBS) -DWITH_DOCS=ON -DBUILD_WITH_PCH=OFF
- -DQT_HOST_PATH=/usr/ -DQT_HOST_PATH_CMAKE_DIR=/usr/lib64/cmake/Qt6"
+configure_args="$(vopt_bool qbs BUILD_QBS) -DWITH_DOCS=ON -DBUILD_WITH_PCH=OFF"
 hostmakedepends="clang llvm perl pkg-config python3 which
- qt6-base-devel qt6-tools qtchooser qt6-shadertools-devel qt6-declarative-tools"
+ qt6-base qt6-tools qtchooser qt6-shadertools qt6-declarative-host-tools"
 makedepends="qt6-declarative-devel
  qt6-quick3d-devel qt6-svg-devel qt6-plugin-odbc qt6-plugin-sqlite
  qt6-plugin-pgsql qt6-plugin-mysql qt6-qt5compat-devel
  qt6-serialport-devel
  clang llvm clang-tools-extra"
-depends="qt6-plugin-sqlite"
+depends="qt6-plugin-sqlite mesa-dri"
 short_desc="Cross-platform IDE for Qt developers"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
@@ -26,7 +25,7 @@ python_version=3
 build_options="qbs"
 desc_option_qbs="Build vendored Qbs"
 
-if [ -z "$XBPS_CROSS_BUILD" ]; then
+if [ -z "$XBPS_CROSS_BUILD" ] && [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
 	hostmakedepends+=" qt6-tools-devel"
 	build_options_default="qbs"
 fi
@@ -35,16 +34,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	CXXFLAGS+=" -latomic "
-fi
-
-pre_configure() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
-		ln -sf /usr/lib/qt6/libexec/qmltyperegistrar ${XBPS_CROSS_BASE}/usr/lib/qt6/libexec/qmltyperegistrar
-	fi
-}
-
 post_install() {
 	# Install the license with the annotation for
 	# the Qt Company GPL Exception 1.0
@@ -94,11 +83,9 @@ qtcreator-qt6_package() {
  qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite qt6-base-doc"
 	# Not for big endian targets and not if word sizes of host and target differ
 	if [ "$XBPS_TARGET_ENDIAN" = "le" -a "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then
-		# qt5-webengine cannot be built for armv5tel
-		case "$XBPS_TARGET_MACHINE" in
-			armv5tel*) ;;
-			*) depends+=" qt6-webengine-devel" ;;
-		esac
+		if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
+			depends+=" qt6-webengine-devel"
+		fi
 	fi
 	build_style=meta
 }