diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:01:05 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:01:05 +0100 |
commit | 196097bfc84d297199ea591fc19e714c88796e8e (patch) | |
tree | 44db9b8047021f358a009b1d8662e69711f6b969 /tests/auto/webchannel/tst_webchannel.h | |
parent | 1cbc05a6568db5e0ff094f8e09723c607ade88af (diff) | |
parent | 87d83df5f3fa2a582385e70dc22c4a9789134f99 (diff) | |
download | qtwebchannel-196097bfc84d297199ea591fc19e714c88796e8e.tar.gz |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I601a28bfd7eb92d894295d7b7848b4a80dcc1d5d
Diffstat (limited to 'tests/auto/webchannel/tst_webchannel.h')
-rw-r--r-- | tests/auto/webchannel/tst_webchannel.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h index 11786b4..5e832c9 100644 --- a/tests/auto/webchannel/tst_webchannel.h +++ b/tests/auto/webchannel/tst_webchannel.h @@ -69,6 +69,7 @@ class TestObject : public QObject Q_PROPERTY(QString bar READ bar NOTIFY theBarHasChanged) Q_PROPERTY(QObject * objectProperty READ objectProperty WRITE setObjectProperty NOTIFY objectPropertyChanged) Q_PROPERTY(TestObject * returnedObject READ returnedObject WRITE setReturnedObject NOTIFY returnedObjectChanged) + Q_PROPERTY(QString prop READ prop WRITE setProp NOTIFY propChanged) public: explicit TestObject(QObject *parent = 0) @@ -96,6 +97,11 @@ public: return mReturnedObject; } + QString prop() const + { + return mProp; + } + Q_INVOKABLE void method1() {} protected: @@ -111,6 +117,8 @@ signals: void theBarHasChanged(); void objectPropertyChanged(); void returnedObjectChanged(); + void propChanged(const QString&); + void replay(); public slots: void slot1() {} @@ -128,6 +136,9 @@ public slots: emit objectPropertyChanged(); } + void setProp(const QString&prop) {emit propChanged(mProp=prop);} + void fire() {emit replay();} + protected slots: void slot3() {} @@ -137,6 +148,7 @@ private slots: public: QObject *mObjectProperty; TestObject *mReturnedObject; + QString mProp; }; class BenchObject : public QObject @@ -281,6 +293,7 @@ private slots: void testRemoveUnusedTransports(); void testPassWrappedObjectBack(); void testInfiniteRecursion(); + void testAsyncObject(); void benchClassInfo(); void benchInitializeClients(); |