diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-04-23 09:33:25 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-04-23 09:34:29 +0200 |
| commit | 580fa7dc88aae23053e44ffa335a15f6af112a20 (patch) | |
| tree | 5bc915d7c2e252739122d9441bd0d7fa7175d0c2 /src/qml/types/qquickworkerscript_p.h | |
| parent | 6767114285db9d0e16dc278d08f231e8561546b4 (diff) | |
| parent | c00283bb3bb966bf60c307ec8283bd98c12318bf (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ifec879473540b609403ac951967f6d9ecb0bb6f0
Diffstat (limited to 'src/qml/types/qquickworkerscript_p.h')
| -rw-r--r-- | src/qml/types/qquickworkerscript_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/types/qquickworkerscript_p.h b/src/qml/types/qquickworkerscript_p.h index 1a8d2ab076..87cf2e9754 100644 --- a/src/qml/types/qquickworkerscript_p.h +++ b/src/qml/types/qquickworkerscript_p.h @@ -83,7 +83,6 @@ private: }; class QQmlV4Function; -class QQmlV4Handle; class Q_AUTOTEST_EXPORT QQuickWorkerScript : public QObject, public QQmlParserStatus { Q_OBJECT @@ -102,7 +101,7 @@ public Q_SLOTS: Q_SIGNALS: void sourceChanged(); - void message(const QQmlV4Handle &messageObject); + void message(const QJSValue &messageObject); protected: void classBegin() override; |