summaryrefslogtreecommitdiff
path: root/tests/auto/webchannel/tst_webchannel.h
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/webchannel/tst_webchannel.h')
-rw-r--r--tests/auto/webchannel/tst_webchannel.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h
index c64cd05..e75c13c 100644
--- a/tests/auto/webchannel/tst_webchannel.h
+++ b/tests/auto/webchannel/tst_webchannel.h
@@ -90,6 +90,7 @@ class TestObject : public QObject
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)
+ Q_PROPERTY(QString stringProperty READ readStringProperty WRITE setStringProperty BINDABLE bindableStringProperty NOTIFY stringPropertyChanged)
public:
explicit TestObject(QObject *parent = 0)
@@ -129,6 +130,9 @@ public:
return mProp;
}
+ QString readStringProperty() const { return mStringProperty; }
+ void setStringProperty(QString v) { mStringProperty = v; emit stringPropertyChanged(); }
+
Q_INVOKABLE void method1() {}
protected:
@@ -148,6 +152,7 @@ signals:
void replay();
void overloadSignal(int);
void overloadSignal(float);
+ void stringPropertyChanged();
public slots:
void slot1() {}
@@ -174,6 +179,10 @@ public slots:
QString overload(const QString &str) { return str.toUpper(); }
QString overload(const QString &str, int i) { return str.toUpper() + QString::number(i + 1); }
QString overload(const QJsonArray &v) { return QString::number(v[1].toInt()) + v[0].toString(); }
+ QBindable<QString> bindableStringProperty() { return &mStringProperty; }
+ QString getStringProperty() const { return mStringProperty; }
+ void bindStringPropertyToStringProperty2() { bindableStringProperty().setBinding(Qt::makePropertyBinding(mStringProperty2)); }
+ void setStringProperty2(QString& string) { mStringProperty2 = string; }
protected slots:
void slot3() {}
@@ -185,6 +194,8 @@ public:
QObject *mObjectProperty;
TestObject *mReturnedObject;
QString mProp;
+ Q_OBJECT_BINDABLE_PROPERTY(TestObject, QString, mStringProperty);
+ QProperty<QString> mStringProperty2;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(TestObject::TestFlags)
@@ -345,6 +356,7 @@ private slots:
void testJsonToVariant();
void testInfiniteRecursion();
void testAsyncObject();
+ void testQProperty();
void testDeletionDuringMethodInvocation_data();
void testDeletionDuringMethodInvocation();