diff options
Diffstat (limited to 'tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp')
| -rw-r--r-- | tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp index 5480168d3..8cc614ce7 100644 --- a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp +++ b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <QtCore/QThread> @@ -40,7 +15,7 @@ class SignalWaiter : public QThread public: SignalWaiter(); - void run(); + void run() override; public slots: void stopWaiting(); @@ -101,8 +76,7 @@ void tst_QHelpContentModel::setupContents() h.setReadOnly(false); QHelpContentModel *m = h.contentModel(); SignalWaiter w; - connect(m, SIGNAL(contentsCreated()), - &w, SLOT(stopWaiting())); + connect(m, &QHelpContentModel::contentsCreated, &w, &SignalWaiter::stopWaiting); w.start(); h.setupData(); int i = 0; @@ -127,8 +101,7 @@ void tst_QHelpContentModel::contentItemAt() h.setReadOnly(false); QHelpContentModel *m = h.contentModel(); SignalWaiter w; - connect(m, SIGNAL(contentsCreated()), - &w, SLOT(stopWaiting())); + connect(m, &QHelpContentModel::contentsCreated, &w, &SignalWaiter::stopWaiting); w.start(); h.setupData(); int i = 0; |