From d86757b2890e89c707370387b23ff4c3c13be355 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Thu, 9 Mar 2023 17:35:42 +0100 Subject: Fix configuration version conflict between the Qt 5 and Qt 6 AM The configuration caches are versioned, but the Qt 5 and 6 versions got their cache version numbers bumped independently. This led to a situation where 5.15.12 and 6.4.2 both ended up at version '9', although they are binary incompatible. The fix here is to encode the major Qt version into the cache header as well, to make caches incompatible between Qt major versions. Change-Id: I7bbf7cb97cc1ea8bc4f16285588958ba11c19833 Reviewed-by: Bernd Weimer (cherry picked from commit 5fe99d4113d460b0039130d5333bd8201452c03b) Reviewed-by: Qt Cherry-pick Bot --- src/common-lib/configcache_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common-lib/configcache_p.h b/src/common-lib/configcache_p.h index 742b5097..cac32571 100644 --- a/src/common-lib/configcache_p.h +++ b/src/common-lib/configcache_p.h @@ -20,7 +20,7 @@ struct ConfigCacheEntry struct CacheHeader { enum { Magic = 0x23d39366, // dd if=/dev/random bs=4 count=1 status=none | xxd -p - Version = 3 }; + Version = 3 | (QT_VERSION_MAJOR << 24) }; quint32 magic = Magic; quint32 version = Version; -- cgit v1.2.1