From dcc6d6ec2235a6db9e40e32d8a313bba6774b8ea Mon Sep 17 00:00:00 2001 From: Oliver Eftevaag Date: Tue, 4 Jun 2024 18:40:51 +0200 Subject: [PATCH] Remove AA_DontUsePopupWindows Back when 953f70179969b0beb797607c5454e36349319929 was first introduced, we thought it would be a good idea to make popups in qtdeclarative use popup windows by default, and then let users revert back to the old behavior via setting an application attribute. We eventually decided to go in a different direction, causing AA_DontUsePopupWindows to no longer be needed. More information can be found in here 823026646c62c7e3b42be1549fcb61debb468e60 in qtdeclarative. Reverts 953f70179969b0beb797607c5454e36349319929 Change-Id: I3c5054d92c4d8c38193e7e0c193f425b7414f6dd Reviewed-by: Fabian Kosmale (cherry picked from commit a3df8dac90c6f78c6b8832e8413b8542818cea0e) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qnamespace.h | 2 +- src/corelib/global/qnamespace.qdoc | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 1569577b129..9a0aa72bb5d 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -462,7 +462,7 @@ namespace Qt { AA_DisableShaderDiskCache = 27, AA_DontShowShortcutsInContextMenus = 28, AA_CompressTabletEvents = 29, - AA_DontUsePopupWindows = 30, + // AA_DisableWindowContextHelpButton = 30, (in Qt 5) AA_DisableSessionManager = 31, // Add new attributes before this line diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index a4da31211d8..6644ae8e136 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -279,11 +279,6 @@ level windows, unless required by the implementation. This value was added in Qt 6.8. - \value AA_DontUsePopupWindows When this attribute is set, popups will always appear - as items in the scene, rather than having their own dedicated windows. - Setting this attribute will only affect Qt Quick applications. - This value was added in Qt 6.8. - \omitvalue AA_AttributeCount \omitvalue AA_EnableHighDpiScaling \omitvalue AA_UseHighDpiPixmaps