diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2024-03-25 18:20:14 +0800 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2024-04-04 11:31:51 +0800 |
| commit | 907181cb21fa79059f226fb1eeac8da938031368 (patch) | |
| tree | a11bf321301ccf96e899c60797aee62f2afac4cb /src/corelib/global/qnamespace.h | |
| parent | 8424a6401469fdfb9fbaad488fdd5fe65050f34a (diff) | |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 3b4daa0f8f..1aa694ef2c 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 |