diff --git a/classes/srcrev-update.bbclass b/classes/srcrev-update.bbclass
index 7179860..880af30 100644
--- a/classes/srcrev-update.bbclass
+++ b/classes/srcrev-update.bbclass
@@ -1,7 +1,10 @@
 python do_srcrev_update() {
     import subprocess
 
-    recipe = d.getVar("FILE")
+    recipe = d.getVar('FILE')
+    srcrev_file = os.path.join(os.path.dirname(recipe), 'qt6-git.inc')
+
+    module = d.getVar('QT_MODULE')
 
     scms = []
     fetcher = bb.fetch2.Fetch(d.getVar('SRC_URI').split(), d)
@@ -13,32 +16,19 @@ python do_srcrev_update() {
     if len(scms) == 0:
         return
 
-    if len(scms) == 1 and len(urldata[scms[0]].names) == 1:
-        ud = urldata[scms[0]]
-        rev = ud.method.latest_revision(ud, d, ud.names[0])
-        srcrev = d.getVar("SRCREV")
-
-        if srcrev == rev:
-            bb.plain("%s SRCREV: %s is already latest" % (recipe, srcrev))
-            return
-
-        bb.plain("%s SRCREV: %s -> %s" % (recipe, srcrev, rev))
-        cmd = "sed -i %s -e 's/%s/%s/'" % (recipe, srcrev, rev)
-        bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None)
-        return
-
     for scm in scms:
         ud = urldata[scm]
         for name in ud.names:
             rev = ud.method.latest_revision(ud, d, name)
             srcrev = d.getVar("SRCREV_%s" % name)
+            if srcrev is None: srcrev = d.getVar("SRCREV")
 
             if srcrev == rev:
-                bb.plain("%s SRCREV_%s: %s is already latest" % (recipe, name, srcrev))
+                bb.plain("%s: %s is already latest" % (name, srcrev))
                 continue
 
-            bb.plain("%s SRCREV_%s: %s -> %s" % (recipe, name, srcrev, rev))
-            cmd = "sed -i %s -e 's/%s/%s/'" % (recipe, srcrev, rev)
+            bb.plain("%s: %s -> %s" % (name, srcrev, rev))
+            cmd = "sed -E -i %s %s -e '/SRCREV(_%s)? /s/%s/%s/'" %  (recipe, srcrev_file, name, srcrev, rev)
             bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None)
 }
 do_srcrev_update[nostamp] = "1"
diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb
index f7a20e0..3af3d03 100644
--- a/recipes-qt/qt6/qt3d_git.bb
+++ b/recipes-qt/qt6/qt3d_git.bb
@@ -17,7 +17,7 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
 "
 
 DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native"
@@ -26,6 +26,4 @@ PACKAGECONFIG ?= "system-assimp"
 PACKAGECONFIG[system-assimp] = "-DFEATURE_qt3d_system_assimp=ON,-DQT_FEATURE_qt3d_system_assimp=OFF,assimp"
 PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
 
-SRCREV_FORMAT = "qt3d_assimp"
-SRCREV_qt3d = "f0419c69a235efe44769379e7a724b58cd678188"
-SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
+SRCREV_FORMAT = "qt3d_qt3d-assimp"
diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb
index f00c763..3c393b5 100644
--- a/recipes-qt/qt6/qt5compat_git.bb
+++ b/recipes-qt/qt6/qt5compat_git.bb
@@ -21,4 +21,3 @@ PACKAGECONFIG[qml] = ",,qtdeclarative"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "d152376c253671a89a8ac4f3c197883916329f41"
diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc
index 0ca9f80..dfe0fcb 100644
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@@ -12,3 +12,45 @@ CVE_PRODUCT = "qt"
 S = "${WORKDIR}/git"
 
 PV = "6.2.0"
+
+SRCREV = "${SRCREV_${QT_MODULE}}"
+
+SRCREV_qt3d = "f0419c69a235efe44769379e7a724b58cd678188"
+SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
+SRCREV_qt5compat = "d152376c253671a89a8ac4f3c197883916329f41"
+SRCREV_qtbase = "a1f6721fc8874d0c15b723db9908d090cd422585"
+SRCREV_qtcharts = "bd6abec028851a2273f63ec6726f6f0825bcf224"
+SRCREV_qtcoap = "9d3e024e69e2fbbc7f76ea6449c28de5ad4f6bff"
+SRCREV_qtconnectivity = "42ea98498aa25bc7b1911a7a6035aa21d856ccb6"
+SRCREV_qtdatavis3d = "6023c0ff5df62c553196a69c79af84a1396f4af7"
+SRCREV_qtdeclarative = "830eaefec50e0ba36bbdce412bd79a4919267fa2"
+SRCREV_qtdeviceutilities = "a83082dc52c83895de6221688c55fb49c094d84e"
+SRCREV_qtimageformats = "881ca22d208a5a9171c4373ec22a69a6beecd704"
+SRCREV_qtlottie = "464c1bf7b7c719c3387b611feea02ee7fedeab52"
+SRCREV_qtmqtt = "2d26dfbc699f9b2862954ad6ecd0f3aeee76dda4"
+SRCREV_qtmultimedia = "e3543802e6ac47906de5b2dbba01ae32bb669b18"
+SRCREV_qtnetworkauth = "eef5b6383d8dff8aa31c666b048c31a28fd5d56b"
+SRCREV_qtopcua = "5e23095734dbb25ed18059704245473780a8125b"
+SRCREV_qtlocation = "7373157d821b71b4b33bfe420a4e216675a535b6"
+SRCREV_qtquick3d = "c84eed2b20f8ca959e485c3214ee22a515a54ece"
+SRCREV_qtquick3d-assimp  = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
+SRCREV_qtquickdesigner-components = "decdf79401763670419c45cd33e38390d46d8db4"
+SRCREV_qtquicktimeline = "c2a29b33475ae602a057b8ac6255a6c872618ac4"
+SRCREV_qtremoteobjects = "c956f6368631938c802db7ed1e8176ba9be8ed41"
+SRCREV_qtscxml = "6f0c45fb7648d1116638c84c8562e8ec12f8795f"
+SRCREV_qtsensors = "45ae518006f1624097bfd029a8cd2f8780610ae2"
+SRCREV_qtserialbus = "ae2372e340f4ecb07d73630e875f10397a0a7d38"
+SRCREV_qtserialport = "7a7e7376e3cc7cbd39e7eb7b5b6398d2553dd9a2"
+SRCREV_qtshadertools = "e7f5087e43fc3f9a6a6202321d59c96fb8a8d0f9"
+SRCREV_qtspeech = "462c3384467cec55a31fde11afb959321063a0ce"
+SRCREV_qtsvg = "f41ee4fab89394361de39002ebb1252a2dde21be"
+SRCREV_qttools = "8b3c7447d691d708e7f6ae19158041531be5cab7"
+SRCREV_qttools-qlitehtml = "908670c5b68d3bcf4712019a028079b8b2042dd4"
+SRCREV_qttools-litehtml = "db7f59d5886fd50f84d48720c79dc2e6152efa83"
+SRCREV_qttranslations = "02783d8aa91a155a744a94e4b14d9ef0e1b58514"
+SRCREV_qtvirtualkeyboard = "10cfad9a04817967d58fb4395be32f22afcc6452"
+SRCREV_qtwayland = "ca3a1cbd12bc90c6fd3aaabec84bf5d90ba4e343"
+SRCREV_qtwebchannel = "a85e2f154cd662397303d4d40ee28e342826318d"
+SRCREV_qtwebengine = "9d319982178a13d7c4195a6bc383b2f58c9f8468"
+SRCREV_qtwebengine-chromium = "202e34476e934633b3c2e4679a53c4b0847364a8"
+SRCREV_qtwebsockets = "25487db640c28754827373190546f947f2e1eb67"
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index 0a38770..3d598f5 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -157,4 +157,3 @@ INHIBIT_PACKAGE_STRIP_FILES = "\
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "a1f6721fc8874d0c15b723db9908d090cd422585"
diff --git a/recipes-qt/qt6/qtcharts_git.bb b/recipes-qt/qt6/qtcharts_git.bb
index b46c160..be915a1 100644
--- a/recipes-qt/qt6/qtcharts_git.bb
+++ b/recipes-qt/qt6/qtcharts_git.bb
@@ -13,4 +13,3 @@ DEPENDS += "qtbase"
 PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[qml] = ",,qtdeclarative"
 
-SRCREV = "bd6abec028851a2273f63ec6726f6f0825bcf224"
diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb
index 25514a5..4a45fed 100644
--- a/recipes-qt/qt6/qtcoap_git.bb
+++ b/recipes-qt/qt6/qtcoap_git.bb
@@ -12,4 +12,3 @@ DEPENDS += "qtbase"
 
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative"
 
-SRCREV = "9d3e024e69e2fbbc7f76ea6449c28de5ad4f6bff"
diff --git a/recipes-qt/qt6/qtconnectivity_git.bb b/recipes-qt/qt6/qtconnectivity_git.bb
index 42071ac..fdccb83 100644
--- a/recipes-qt/qt6/qtconnectivity_git.bb
+++ b/recipes-qt/qt6/qtconnectivity_git.bb
@@ -20,4 +20,3 @@ DEPENDS += "qtbase qtdeclarative"
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
 PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
 
-SRCREV = "42ea98498aa25bc7b1911a7a6035aa21d856ccb6"
diff --git a/recipes-qt/qt6/qtdatavis3d_git.bb b/recipes-qt/qt6/qtdatavis3d_git.bb
index 80e1dcc..2ea621c 100644
--- a/recipes-qt/qt6/qtdatavis3d_git.bb
+++ b/recipes-qt/qt6/qtdatavis3d_git.bb
@@ -10,4 +10,3 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "6023c0ff5df62c553196a69c79af84a1396f4af7"
diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb
index 0c72c29..2a0202f 100644
--- a/recipes-qt/qt6/qtdeclarative_git.bb
+++ b/recipes-qt/qt6/qtdeclarative_git.bb
@@ -16,4 +16,3 @@ DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "830eaefec50e0ba36bbdce412bd79a4919267fa2"
diff --git a/recipes-qt/qt6/qtdeviceutilities_git.bb b/recipes-qt/qt6/qtdeviceutilities_git.bb
index c4223d8..66b4cf9 100644
--- a/recipes-qt/qt6/qtdeviceutilities_git.bb
+++ b/recipes-qt/qt6/qtdeviceutilities_git.bb
@@ -8,4 +8,3 @@ include recipes-qt/qt6/qt6-git.inc
 DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
 RDEPENDS_${PN} = "connman"
 
-SRCREV = "a83082dc52c83895de6221688c55fb49c094d84e"
diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb
index 9c84068..0f7618f 100644
--- a/recipes-qt/qt6/qtimageformats_git.bb
+++ b/recipes-qt/qt6/qtimageformats_git.bb
@@ -24,4 +24,3 @@ PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng"
 PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff"
 PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp"
 
-SRCREV = "881ca22d208a5a9171c4373ec22a69a6beecd704"
diff --git a/recipes-qt/qt6/qtlottie_git.bb b/recipes-qt/qt6/qtlottie_git.bb
index 66eb9c0..dc81cf3 100644
--- a/recipes-qt/qt6/qtlottie_git.bb
+++ b/recipes-qt/qt6/qtlottie_git.bb
@@ -11,4 +11,3 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "464c1bf7b7c719c3387b611feea02ee7fedeab52"
diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb
index a7de183..67f1f69 100644
--- a/recipes-qt/qt6/qtmqtt_git.bb
+++ b/recipes-qt/qt6/qtmqtt_git.bb
@@ -13,4 +13,3 @@ DEPENDS += "qtbase"
 
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
 
-SRCREV = "2d26dfbc699f9b2862954ad6ecd0f3aeee76dda4"
diff --git a/recipes-qt/qt6/qtmultimedia_git.bb b/recipes-qt/qt6/qtmultimedia_git.bb
index bd18696..631bdd4 100644
--- a/recipes-qt/qt6/qtmultimedia_git.bb
+++ b/recipes-qt/qt6/qtmultimedia_git.bb
@@ -22,4 +22,3 @@ PACKAGECONFIG[qml] = ",,qtdeclarative"
 
 EXTRA_OECMAKE += "-DFEATURE_gpu_vivante=OFF"
 
-SRCREV = "e3543802e6ac47906de5b2dbba01ae32bb669b18"
diff --git a/recipes-qt/qt6/qtnetworkauth_git.bb b/recipes-qt/qt6/qtnetworkauth_git.bb
index 2fd9a55..65a59a2 100644
--- a/recipes-qt/qt6/qtnetworkauth_git.bb
+++ b/recipes-qt/qt6/qtnetworkauth_git.bb
@@ -11,4 +11,3 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "eef5b6383d8dff8aa31c666b048c31a28fd5d56b"
diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb
index bd378da..71143e3 100644
--- a/recipes-qt/qt6/qtopcua_git.bb
+++ b/recipes-qt/qt6/qtopcua_git.bb
@@ -20,4 +20,3 @@ SECURITY_STRINGFORMAT = ""
 
 DEPENDS += "qtbase"
 
-SRCREV = "5e23095734dbb25ed18059704245473780a8125b"
diff --git a/recipes-qt/qt6/qtpositioning_git.bb b/recipes-qt/qt6/qtpositioning_git.bb
index d9fc215..5cac69b 100644
--- a/recipes-qt/qt6/qtpositioning_git.bb
+++ b/recipes-qt/qt6/qtpositioning_git.bb
@@ -22,4 +22,3 @@ PACKAGECONFIG[gypsy] = "-DFEATURE_gypsy=ON,-DFEATURE_gypsy=OFF,gconf gypsy"
 PACKAGECONFIG[nmea] = ",,qtserialport"
 PACKAGECONFIG[qml] = ",,qtdeclarative"
 
-SRCREV = "7373157d821b71b4b33bfe420a4e216675a535b6"
diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb
index 8665d3b..23855ae 100644
--- a/recipes-qt/qt6/qtquick3d_git.bb
+++ b/recipes-qt/qt6/qtquick3d_git.bb
@@ -12,7 +12,7 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
 "
 
 DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native qtquick3d-native"
@@ -25,6 +25,4 @@ FILES_${PN}-qmlplugins += " \
   ${QT6_INSTALL_QMLDIR}/QtQuick3D/Helpers/meshes/*.mesh \
 "
 
-SRCREV_FORMAT = "qtquick3d_assimp"
-SRCREV_qtquick3d = "c84eed2b20f8ca959e485c3214ee22a515a54ece"
-SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
+SRCREV_FORMAT = "qtquick3d_qtquick3d-assimp"
diff --git a/recipes-qt/qt6/qtquickdesigner-components_git.bb b/recipes-qt/qt6/qtquickdesigner-components_git.bb
index faafbb2..e56ce81 100644
--- a/recipes-qt/qt6/qtquickdesigner-components_git.bb
+++ b/recipes-qt/qt6/qtquickdesigner-components_git.bb
@@ -13,4 +13,3 @@ QT_MODULE_BRANCH = "dev"
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "decdf79401763670419c45cd33e38390d46d8db4"
diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb
index c05f241..e14cff2 100644
--- a/recipes-qt/qt6/qtquicktimeline_git.bb
+++ b/recipes-qt/qt6/qtquicktimeline_git.bb
@@ -11,4 +11,3 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS = "qtbase qtdeclarative"
 
-SRCREV = "c2a29b33475ae602a057b8ac6255a6c872618ac4"
diff --git a/recipes-qt/qt6/qtremoteobjects_git.bb b/recipes-qt/qt6/qtremoteobjects_git.bb
index 396869d..9a80a0b 100644
--- a/recipes-qt/qt6/qtremoteobjects_git.bb
+++ b/recipes-qt/qt6/qtremoteobjects_git.bb
@@ -13,6 +13,5 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
 
-SRCREV = "c956f6368631938c802db7ed1e8176ba9be8ed41"
 
 BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt6/qtscxml_git.bb b/recipes-qt/qt6/qtscxml_git.bb
index 99b1a11..d8c67e5 100644
--- a/recipes-qt/qt6/qtscxml_git.bb
+++ b/recipes-qt/qt6/qtscxml_git.bb
@@ -17,4 +17,3 @@ PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "6f0c45fb7648d1116638c84c8562e8ec12f8795f"
diff --git a/recipes-qt/qt6/qtsensors_git.bb b/recipes-qt/qt6/qtsensors_git.bb
index 3223d76..9d59cd8 100644
--- a/recipes-qt/qt6/qtsensors_git.bb
+++ b/recipes-qt/qt6/qtsensors_git.bb
@@ -14,4 +14,3 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "45ae518006f1624097bfd029a8cd2f8780610ae2"
diff --git a/recipes-qt/qt6/qtserialbus_git.bb b/recipes-qt/qt6/qtserialbus_git.bb
index b027935..04640fd 100644
--- a/recipes-qt/qt6/qtserialbus_git.bb
+++ b/recipes-qt/qt6/qtserialbus_git.bb
@@ -15,4 +15,3 @@ DEPENDS += "qtbase qtserialport qtserialbus-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "ae2372e340f4ecb07d73630e875f10397a0a7d38"
diff --git a/recipes-qt/qt6/qtserialport_git.bb b/recipes-qt/qt6/qtserialport_git.bb
index 63045e9..1fe3356 100644
--- a/recipes-qt/qt6/qtserialport_git.bb
+++ b/recipes-qt/qt6/qtserialport_git.bb
@@ -16,4 +16,3 @@ DEPENDS += "qtbase"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "7a7e7376e3cc7cbd39e7eb7b5b6398d2553dd9a2"
diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb
index fc07f04..6b4bc6c 100644
--- a/recipes-qt/qt6/qtshadertools_git.bb
+++ b/recipes-qt/qt6/qtshadertools_git.bb
@@ -12,4 +12,3 @@ DEPENDS = "qtbase qtshadertools-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "e7f5087e43fc3f9a6a6202321d59c96fb8a8d0f9"
diff --git a/recipes-qt/qt6/qtspeech_git.bb b/recipes-qt/qt6/qtspeech_git.bb
index d5a6f9c..4f88d57 100644
--- a/recipes-qt/qt6/qtspeech_git.bb
+++ b/recipes-qt/qt6/qtspeech_git.bb
@@ -13,4 +13,3 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "462c3384467cec55a31fde11afb959321063a0ce"
diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb
index f6f63d7..59da586 100644
--- a/recipes-qt/qt6/qtsvg_git.bb
+++ b/recipes-qt/qt6/qtsvg_git.bb
@@ -13,4 +13,3 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "f41ee4fab89394361de39002ebb1252a2dde21be"
diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb
index d04c43b..94c7aa0 100644
--- a/recipes-qt/qt6/qttools_git.bb
+++ b/recipes-qt/qt6/qttools_git.bb
@@ -13,8 +13,8 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 SRC_URI += " \
-    ${QT_GIT}/playground/qlitehtml.git;name=qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \
-    git://github.com/litehtml/litehtml.git;name=litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml \
+    ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \
+    git://github.com/litehtml/litehtml.git;name=qttools-litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml \
 "
 
 DEPENDS += "qtbase qtdeclarative qttools-native"
@@ -23,8 +23,4 @@ FILES_${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV_FORMAT = "qttools_qlitehtml_litehtml"
-
-SRCREV_qttools = "8b3c7447d691d708e7f6ae19158041531be5cab7"
-SRCREV_qlitehtml = "908670c5b68d3bcf4712019a028079b8b2042dd4"
-SRCREV_litehtml = "db7f59d5886fd50f84d48720c79dc2e6152efa83"
+SRCREV_FORMAT = "qttools_qttools-qlitehtml_qttools-litehtml"
diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb
index 0351186..1fa6a98 100644
--- a/recipes-qt/qt6/qttranslations_git.bb
+++ b/recipes-qt/qt6/qttranslations_git.bb
@@ -25,4 +25,3 @@ python split_translation_packages () {
     d.setVar('RRECOMMENDS_' + pn, ' '.join(pkgs))
 }
 
-SRCREV = "02783d8aa91a155a744a94e4b14d9ef0e1b58514"
diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb
index bbe5bce..f572d93 100644
--- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb
@@ -115,4 +115,3 @@ FILES_${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat"
 
 DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
 
-SRCREV = "10cfad9a04817967d58fb4395be32f22afcc6452"
diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb
index 18f3d69..8ac0a31 100644
--- a/recipes-qt/qt6/qtwayland_git.bb
+++ b/recipes-qt/qt6/qtwayland_git.bb
@@ -37,4 +37,3 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "ca3a1cbd12bc90c6fd3aaabec84bf5d90ba4e343"
diff --git a/recipes-qt/qt6/qtwebchannel_git.bb b/recipes-qt/qt6/qtwebchannel_git.bb
index 9548715..ec03598 100644
--- a/recipes-qt/qt6/qtwebchannel_git.bb
+++ b/recipes-qt/qt6/qtwebchannel_git.bb
@@ -18,4 +18,3 @@ PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
 PACKAGECONFIG[qml] = ",,qtdeclarative"
 
-SRCREV = "a85e2f154cd662397303d4d40ee28e342826318d"
diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc
index 259998e..7d80156 100644
--- a/recipes-qt/qt6/qtwebengine.inc
+++ b/recipes-qt/qt6/qtwebengine.inc
@@ -33,7 +33,7 @@ QT_MODULE_BRANCH_CHROMIUM = "90-based"
 FILESEXTRAPATHS_prepend := "${THISDIR}/qtwebengine:"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-CMake-use-generated-yocto-toolchains.patch \
     file://0002-Enable-examples.patch \
 "
@@ -43,6 +43,4 @@ SRC_URI += " \
     file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
 "
 
-SRCREV_qtwebengine = "9d319982178a13d7c4195a6bc383b2f58c9f8468"
-SRCREV_chromium = "202e34476e934633b3c2e4679a53c4b0847364a8"
-SRCREV = "${SRCREV_qtwebengine}"
+SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium"
diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb
index 5f21406..db7d770 100644
--- a/recipes-qt/qt6/qtwebsockets_git.bb
+++ b/recipes-qt/qt6/qtwebsockets_git.bb
@@ -13,4 +13,3 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "25487db640c28754827373190546f947f2e1eb67"