diff options
Diffstat (limited to 'src/qmltest/quicktest_p.h')
| -rw-r--r-- | src/qmltest/quicktest_p.h | 50 |
1 files changed, 9 insertions, 41 deletions
diff --git a/src/qmltest/quicktest_p.h b/src/qmltest/quicktest_p.h index 7897bbcef0..2deffab8ca 100644 --- a/src/qmltest/quicktest_p.h +++ b/src/qmltest/quicktest_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QUICKTEST_P_H #define QUICKTEST_P_H @@ -57,9 +21,11 @@ #include <QtQml/qqmlpropertymap.h> #include <QtQml/qqml.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE -class Q_QUICK_TEST_PRIVATE_EXPORT QTestRootObject : public QObject +class Q_QMLTEST_EXPORT QTestRootObject : public QObject { Q_OBJECT Q_PROPERTY(bool windowShown READ windowShown NOTIFY windowShownChanged) @@ -90,10 +56,10 @@ public: bool hasQuit:1; bool hasTestCase() const { return m_hasTestCase; } - void setHasTestCase(bool value) { m_hasTestCase = value; emit hasTestCaseChanged(); } + void setHasTestCase(bool value) { m_hasTestCase = value; Q_EMIT hasTestCaseChanged(); } bool windowShown() const { return m_windowShown; } - void setWindowShown(bool value) { m_windowShown = value; emit windowShownChanged(); } + void setWindowShown(bool value) { m_windowShown = value; Q_EMIT windowShownChanged(); } QQmlPropertyMap *defined() const { return m_defined; } void init() { setWindowShown(false); setHasTestCase(false); hasQuit = false; } @@ -119,6 +85,8 @@ private: QQmlPropertyMap *m_defined; }; +bool qWaitForSignal(QObject *obj, const char* signal, int timeout = 5000); + QT_END_NAMESPACE #endif // QUICKTEST_P_H |