summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2021-02-03 15:25:37 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2021-04-01 10:04:31 +0200
commit4ceaf22bed1bc0ed2dec4628fd9d9814c0e0fd86 (patch)
treef8a5d075001e4e9cf9671bb87bf9bfe8f26314af /tests
parent2ffb91ac592d69adf9458ac45074174537435918 (diff)
QObjectCompatProperty: Emit signal in notfiy
There is no need to write emit and notify at the same time, as not emitting after notify does not make sense. This naturally only applies to properties with a changed signal. Change-Id: I99ff7863a509262ad9d4f7c9c5afbc66fd37001c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp
index 4186607d90..5ca5fcf935 100644
--- a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp
+++ b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp
@@ -1422,9 +1422,9 @@ signals:
void prop3Changed();
public:
- void setProp1(int val) { prop1Data.setValue(val); prop1Data.notify(); emit prop1Changed();}
- void setProp2(int val) { prop2Data.setValue(val); prop2Data.notify(); emit prop2Changed();}
- void setProp3(int val) { prop3Data.setValue(val); prop3Data.notify(); emit prop3Changed();}
+ void setProp1(int val) { prop1Data.setValue(val); prop1Data.notify();}
+ void setProp2(int val) { prop2Data.setValue(val); prop2Data.notify();}
+ void setProp3(int val) { prop3Data.setValue(val); prop3Data.notify();}
int prop1() { return prop1Data; }
int prop2() { return prop2Data; }
@@ -1435,9 +1435,9 @@ public:
QBindable<int> bindableProp3() { return QBindable<int>(&prop3Data); }
private:
- Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop1Data, &FakeDependencyCreator::setProp1);
- Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop2Data, &FakeDependencyCreator::setProp2);
- Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop3Data, &FakeDependencyCreator::setProp3);
+ Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop1Data, &FakeDependencyCreator::setProp1, &FakeDependencyCreator::prop1Changed);
+ Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop2Data, &FakeDependencyCreator::setProp2, &FakeDependencyCreator::prop2Changed);
+ Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop3Data, &FakeDependencyCreator::setProp3, &FakeDependencyCreator::prop3Changed);
};
void tst_QProperty::noFakeDependencies()