edc984db38
0b421fa58b9a73d657bf17834788fd1175c4767e ensured a correct focus chain, when buttons in a QDialogButtonBox were hidden. The implementation did not check, if a hidden button was added via setStandardButtons(). In consequence, it was removed from the standardButtonHash and never added again. QDialogButtonBox::button() returned nullptr for a standard button, once it had been hidden. That introduced a regression. This follow-up patch makes sure, a standard button is not removed from standardButtonHash, when hidden. By no longer removing it from standardButtonHash, it makes showQDialogButtonBox::button() always return the pointer to the standard button, even if it is hidden. The function handleButtonDestroyed() used the argument QDialogButtonBoxPrivate::RemoveRule::KeepConnections, in order to leave signal/slot connections untouched. It expected the the destroyed button to be removed from standardButtonHash. In order to retain that functionality, the enum class RemoveRule is renamed to RemoveReason, and one value was added. QDialogButtonBoxPrivate now handles all necessary cases of removing a button: ManualRemove (previously Disconnect): - remove button from roles - remove button from standardButtonHash - disconnect all signals LeaveEvent (previously KeepConnections): - remove button from roles - do not remove button form standardButtonHash - do not disconnect signals Destroyed (new): - remove button from roles - remove button from standardButtonHash - do not disconnect signals (QObject will do that) An autotest is added to tst_QDialogButtonBox. Task-number: QTBUG-114377 Pick-to: 6.6 6.5 Change-Id: Ib28625d44fa89c3d06f181f64875c2e456cebbfa Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> |
||
|---|---|---|
| .. | ||
| auto | ||
| baseline | ||
| benchmarks | ||
| global | ||
| libfuzzer | ||
| manual | ||
| shared | ||
| testserver | ||
| CMakeLists.txt | ||
| README | ||
This directory contains autotests and benchmarks based on Qt Test. In order
to run the autotests reliably, you need to configure a desktop to match the
test environment that these tests are written for.
Linux X11:
* The user must be logged in to an active desktop; you can't run the
autotests without a valid DISPLAY that allows X11 connections.
* The tests are run against a KDE3 or KDE4 desktop.
* Window manager uses "click to focus", and not "focus follows mouse". Many
tests move the mouse cursor around and expect this to not affect focus
and activation.
* Disable "click to activate", i.e., when a window is opened, the window
manager should automatically activate it (give it input focus) and not
wait for the user to click the window.