diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:26:34 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:51:20 +0200 |
commit | 5591e821358b9111c79336a66eac4d04bb5811ba (patch) | |
tree | 4b4c1da4f5ccaead1cf4f487622de1d0b242b0b9 /src/widgets/accessible/qaccessiblewidgets.cpp | |
parent | e4079eca49adce16e31dac2a18d49d7a55817891 (diff) | |
parent | ca0c9f82cbf7c8c37acdcbdfdc3fa0c5fc138059 (diff) | |
download | qtbase-5591e821358b9111c79336a66eac4d04bb5811ba.tar.gz |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ide5b3408bfefca410323cf26b810b44c06d3a227
Diffstat (limited to 'src/widgets/accessible/qaccessiblewidgets.cpp')
-rw-r--r-- | src/widgets/accessible/qaccessiblewidgets.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp index 0d87cc486d..52c953ed3a 100644 --- a/src/widgets/accessible/qaccessiblewidgets.cpp +++ b/src/widgets/accessible/qaccessiblewidgets.cpp @@ -101,9 +101,9 @@ QString qt_accHotKey(const QString &text); QList<QWidget*> childWidgets(const QWidget *widget) { - if (widget == 0) - return QList<QWidget*>(); QList<QWidget*> widgets; + if (!widget) + return widgets; for (QObject *o : widget->children()) { QWidget *w = qobject_cast<QWidget *>(o); if (!w) |