diff --git a/mingw-w64-qt5-connectivity/PKGBUILD b/mingw-w64-qt5-connectivity/PKGBUILD
index f7157a14ca..c044c3a4ec 100644
--- a/mingw-w64-qt5-connectivity/PKGBUILD
+++ b/mingw-w64-qt5-connectivity/PKGBUILD
@@ -5,26 +5,37 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=3
+pkgver=${_qtver}+kde+r5
+pkgrel=1
+_commit=5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative"
-             "rsync"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-cc"
+             "git"
+             "rsync")
 options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz")
-sha256sums=('0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0')
+_pkgfn="${_realname/5-/}"
+source=(git+https://invent.kde.org/qt/qt/$_pkgfn#commit=$_commit)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $_pkgfn
+  echo "${_qtver}+kde+r"`git rev-list --count origin/${_qtver}..$_commit`
+}
+
+prepare() {
+  cd $_pkgfn
+  git revert -n 69a87a9b831e36a578594a0a13130c384ad03121 # Revert version bump
+}
 
 build() {
   cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   # https://github.com/msys2/MSYS2-packages/issues/2282
   export MSYS2_ARG_CONV_EXCL='--foreign-types='
diff --git a/mingw-w64-qt5-quickcontrols2/PKGBUILD b/mingw-w64-qt5-quickcontrols2/PKGBUILD
index 027c062526..1c494885bb 100644
--- a/mingw-w64-qt5-quickcontrols2/PKGBUILD
+++ b/mingw-w64-qt5-quickcontrols2/PKGBUILD
@@ -5,8 +5,9 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=4
+pkgver=${_qtver}+kde+r11
+pkgrel=1
+_commit=d8d6b14b9907adbc6ce307d52be34aaa761a58fa
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 pkgdesc="Next generation user interface controls based on Qt Quick (mingw-w64)"
@@ -16,11 +17,22 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-imageformats"
              "${MINGW_PACKAGE_PREFIX}-qt5-declarative"
              "${MINGW_PACKAGE_PREFIX}-qt5-graphicaleffects"
              "${MINGW_PACKAGE_PREFIX}-cc"
+             "git"
              "rsync")
 options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz")
-sha256sums=('671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919')
+_pkgfn="${_realname/5-/}"
+source=(git+https://invent.kde.org/qt/qt/$_pkgfn#commit=$_commit)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $_pkgfn
+  echo "${_qtver}+kde+r"`git rev-list --count origin/${_qtver}..$_commit`
+}
+
+prepare() {
+  cd $_pkgfn
+  git revert -n 2e32d0975eb058c2076597c03b07c67b7ce9027f # Revert version bump
+}
 
 build() {
   cd ${srcdir}
diff --git a/mingw-w64-qt5-speech/PKGBUILD b/mingw-w64-qt5-speech/PKGBUILD
index 39920be6a7..0117668019 100644
--- a/mingw-w64-qt5-speech/PKGBUILD
+++ b/mingw-w64-qt5-speech/PKGBUILD
@@ -5,8 +5,9 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=3
+pkgver=${_qtver}+kde+r3
+pkgrel=1
+_commit=16c625528f5e34e698983fc66a7c9cfb96da8052
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)"
@@ -15,17 +16,27 @@ license=('GPL3' 'LGPL' 'FDL' 'custom')
 makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative"
              "${MINGW_PACKAGE_PREFIX}-qt5-multimedia"
              "${MINGW_PACKAGE_PREFIX}-cc"
+             "git"
              "rsync")
 options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz")
-sha256sums=('c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5')
+_pkgfn="${_realname/5-/}"
+source=(git+https://invent.kde.org/qt/qt/$_pkgfn#commit=$_commit)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $_pkgfn
+  echo "${_qtver}+kde+r"`git rev-list --count origin/${_qtver}..$_commit`
+}
+
+prepare() {
+  cd $_pkgfn
+  git revert -n dedf2d21e8c0893e039edb7bf87646e205685240 # Revert version bump
+}
 
 build() {
   cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   # https://github.com/msys2/MSYS2-packages/issues/2282
   export MSYS2_ARG_CONV_EXCL='--foreign-types='
diff --git a/mingw-w64-qt5-virtualkeyboard/PKGBUILD b/mingw-w64-qt5-virtualkeyboard/PKGBUILD
index c30baa33a1..002b386b45 100644
--- a/mingw-w64-qt5-virtualkeyboard/PKGBUILD
+++ b/mingw-w64-qt5-virtualkeyboard/PKGBUILD
@@ -5,8 +5,9 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=3
+pkgver=${_qtver}+kde+r6
+pkgrel=1
+_commit=98d1fd864cbb6c7c012c4139118808af110fb8f0
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 pkgdesc="Virtual keyboard framework (mingw-w64)"
@@ -16,17 +17,27 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-multimedia"
              "${MINGW_PACKAGE_PREFIX}-qt5-quickcontrols"
              "${MINGW_PACKAGE_PREFIX}-qt5-svg"
              "${MINGW_PACKAGE_PREFIX}-cc"
+             "git"
              "rsync")
 options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz")
-sha256sums=('9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55')
+_pkgfn="${_realname/5-/}"
+source=(git+https://invent.kde.org/qt/qt/$_pkgfn#commit=$_commit)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $_pkgfn
+  echo "${_qtver}+kde+r"`git rev-list --count origin/${_qtver}..$_commit`
+}
+
+prepare() {
+  cd $_pkgfn
+  git revert -n 94fa973de0ec77d27e144f73bc4b788241644090 # Revert version bump
+}
 
 build() {
   cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   # https://github.com/msys2/MSYS2-packages/issues/2282
   export MSYS2_ARG_CONV_EXCL='--foreign-types='