diff options
Diffstat (limited to 'src/qmlworkerscript/qquickworkerscript_p.h')
| -rw-r--r-- | src/qmlworkerscript/qquickworkerscript_p.h | 55 |
1 files changed, 12 insertions, 43 deletions
diff --git a/src/qmlworkerscript/qquickworkerscript_p.h b/src/qmlworkerscript/qquickworkerscript_p.h index 9b5d3587fb..1c4c0500fe 100644 --- a/src/qmlworkerscript/qquickworkerscript_p.h +++ b/src/qmlworkerscript/qquickworkerscript_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml module 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) 2016 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 QQUICKWORKERSCRIPT_P_H #define QQUICKWORKERSCRIPT_P_H @@ -53,6 +17,7 @@ #include <qqml.h> +#include <QtQmlWorkerScript/private/qtqmlworkerscriptglobal_p.h> #include <QtQml/qqmlparserstatus.h> #include <QtCore/qthread.h> #include <QtQml/qjsvalue.h> @@ -82,12 +47,15 @@ private: QQuickWorkerScriptEnginePrivate *d; }; -class QQmlV4Function; -class Q_AUTOTEST_EXPORT QQuickWorkerScript : public QObject, public QQmlParserStatus +class Q_QMLWORKERSCRIPT_EXPORT QQuickWorkerScript : public QObject, public QQmlParserStatus { Q_OBJECT + Q_DISABLE_COPY_MOVE(QQuickWorkerScript) Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) + Q_PROPERTY(bool ready READ ready NOTIFY readyChanged REVISION(2, 15)) + QML_NAMED_ELEMENT(WorkerScript); + QML_ADDED_IN_VERSION(2, 0) Q_INTERFACES(QQmlParserStatus) public: @@ -97,11 +65,14 @@ public: QUrl source() const; void setSource(const QUrl &); + bool ready() const; + public Q_SLOTS: - void sendMessage(QQmlV4Function*); + void sendMessage(QQmlV4FunctionPtr); Q_SIGNALS: void sourceChanged(); + Q_REVISION(2, 15) void readyChanged(); void message(const QJSValue &messageObject); protected: @@ -119,6 +90,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickWorkerScript) - #endif // QQUICKWORKERSCRIPT_P_H |