From 907181cb21fa79059f226fb1eeac8da938031368 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 25 Mar 2024 18:20:14 +0800 Subject: Fix Qt::AA_DontUseNativeMenuWindows being unsettable on 32 bit systems f1bb9cfbf65ab56b67b5a52fa736071e0e534261 added this value, but it was only when a test in qtdeclarative tried to use it that it was discovered that it couldn't be set on 32 bit operating systems (armv7, AKA imx7) due to overflow as a result of the bit shifting that is done. Fix it by using an old, deprecated value. If any old codebase using that older flag tries to build against a newer Qt with this change, it shouldn't affect it, as setting the flag does nothing in Widgets, and native menus didn't exist in earlier versions. Task-number: QTBUG-69558 Change-Id: I520154d02e9ccf007ebd73807685212a19fbee1b Reviewed-by: Thiago Macieira --- src/corelib/global/qnamespace.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 3b4daa0f8fc..1aa694ef2c1 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -431,7 +431,7 @@ namespace Qt { AA_MacDontSwapCtrlAndMeta = 7, AA_Use96Dpi = 8, AA_DisableNativeVirtualKeyboard = 9, - // AA_X11InitThreads = 10, + AA_DontUseNativeMenuWindows = 10, AA_SynthesizeTouchForUnhandledMouseEvents = 11, AA_SynthesizeMouseForUnhandledTouchEvents = 12, #if QT_DEPRECATED_SINCE(6, 0) @@ -463,7 +463,6 @@ namespace Qt { AA_CompressTabletEvents = 29, // AA_DisableWindowContextHelpButton = 30, AA_DisableSessionManager = 31, - AA_DontUseNativeMenuWindows = 32, // Add new attributes before this line AA_AttributeCount -- cgit v1.2.3