1 files changed, 22 insertions, 34 deletions

diff --git a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
index 28731223a9..a06e072b71 100644
--- a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
+++ b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
@@ -1,33 +1,9 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+
+#include <QTest>
+#include <QTimer>
 
 #include <qapplication.h>
 #include <qtoolbar.h>
@@ -73,6 +49,18 @@ void tst_QWidgetAction::cleanup()
 
 void tst_QWidgetAction::defaultWidget()
 {
+    // check that QWidgetAction deals with the widget being deleted before itself:
+    {
+        QToolBar tb1;
+
+        QComboBox combo(&tb1);
+
+        auto action = new QWidgetAction(&tb1);
+        action->setDefaultWidget(&combo);
+
+        tb1.addAction(action);
+    }
+    // check that QWidgetAction takes ownership of the widget:
     {
         QToolBar tb1;
 
@@ -212,7 +200,7 @@ public:
     QList<QWidget *> createdWidgets() const { return QWidgetAction::createdWidgets(); }
 
 protected:
-    virtual QWidget *createWidget(QWidget *parent);
+    virtual QWidget *createWidget(QWidget *parent) override;
 };
 
 QWidget *ComboAction::createWidget(QWidget *parent)
@@ -234,7 +222,7 @@ void tst_QWidgetAction::customWidget()
     tb1.addAction(action);
 
     QList<QWidget *> combos = action->createdWidgets();
-    QCOMPARE(combos.count(), 1);
+    QCOMPARE(combos.size(), 1);
 
     QPointer<QComboBox> combo1 = qobject_cast<QComboBox *>(combos.at(0));
     QVERIFY(combo1);
@@ -242,7 +230,7 @@ void tst_QWidgetAction::customWidget()
     tb2.addAction(action);
 
     combos = action->createdWidgets();
-    QCOMPARE(combos.count(), 2);
+    QCOMPARE(combos.size(), 2);
 
     QCOMPARE(combos.at(0), combo1.data());
     QPointer<QComboBox> combo2 = qobject_cast<QComboBox *>(combos.at(1));
@@ -396,7 +384,7 @@ class CrashedAction : public QWidgetAction
 public:
     inline CrashedAction(QObject *parent) : QWidgetAction(parent) { }
 
-    virtual QWidget *createWidget(QWidget *parent) {
+    virtual QWidget *createWidget(QWidget *parent) override {
         return new QWidget(parent);
     }
 };