diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-03 12:59:23 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-09 09:35:23 +0200 |
commit | c9b2528a9d60561e3050a3dadd86b893cd35349d (patch) | |
tree | 98b9166fb5b781b5d834d18b3af76a70bf3dfe7d /src/corelib | |
parent | b75c82f6456edbc00646da15531cfb63f8957817 (diff) |
Don't set WindowContextHelpButtonHint by default for dialogs and sheets
This makes the Qt::AA_DisableWindowContextHelpButton flag obsolete. It
is already documented as such in Qt 5, so we can remove it now.
[ChangeLog][QtWidgets] Do not show 'What's this' button anymore in
dialogs on Windows. To show the button again, you need to set
Qt::WindowsContextHelpButtonHint explicitly the top level widget.
Change-Id: I30017ca300441cb2ee37940ce97dfe18eb2b118b
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
-rw-r--r-- | src/corelib/global/qnamespace.qdoc | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index ffc3989815..87e5153964 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -528,7 +528,7 @@ namespace Qt { AA_DisableShaderDiskCache = 27, AA_DontShowShortcutsInContextMenus = 28, AA_CompressTabletEvents = 29, - AA_DisableWindowContextHelpButton = 30, // ### Qt 6: remove me + // AA_DisableWindowContextHelpButton = 30, AA_DisableSessionManager = 31, // Add new attributes before this line diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index cff2fab398..480d96acc7 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -280,12 +280,6 @@ \e glProgramBinary(). In the unlikely event of this being problematic, set this attribute to disable all disk-based caching of shaders. - \value AA_DisableWindowContextHelpButton Disables the WindowContextHelpButtonHint - by default on Qt::Sheet and Qt::Dialog widgets. This hides the \gui ? button - on Windows, which only makes sense if you use \l QWhatsThis functionality. - This value was added in Qt 5.10. In Qt 6, WindowContextHelpButtonHint - will not be set by default. - \value AA_DisableSessionManager Disables the QSessionManager. By default Qt will connect to a running session manager for a GUI application on supported platforms, use of a session manager may be |