diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2023-03-09 17:35:42 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-03-10 10:36:04 +0000 |
| commit | 49e6810de6bd641a4155e5b0ec01a7ab275d0d1e (patch) | |
| tree | 41bacbda6e3975483677b788e5f183dfcc69a20b | |
| parent | 23a721efec47c9a8fd3a04c8ab46ccd8ab6dfc97 (diff) | |
| download | qtapplicationmanager-49e6810de6bd641a4155e5b0ec01a7ab275d0d1e.tar.gz | |
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 <bernd.weimer@qt.io>
(cherry picked from commit 5fe99d4113d460b0039130d5333bd8201452c03b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/common-lib/configcache_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |