From 5603be705e9e99b164bb85014c2abd0edf1d13f3 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 2 May 2019 14:50:31 +0200 Subject: Qt6: remove support for property flags being functions Property flags should be compile time booleans, not something to be determined at runtime. We've been using this to dynamically disable some properties in QWidget based classes dependent on the state of a different property, but this should better get implemented on top of our widgets. Change-Id: I6296e8761303ecdf24d9e842142e8596304c015d Reviewed-by: Simon Hausmann Reviewed-by: Ulf Hermann Reviewed-by: Lars Knoll Reviewed-by: Friedemann Kleint --- tests/auto/tools/moc/tst_moc.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'tests/auto/tools/moc') diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 960164dac4..37d3cc130f 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -620,7 +620,6 @@ class tst_Moc : public QObject Q_PROPERTY(bool user1 READ user1 USER true ) Q_PROPERTY(bool user2 READ user2 USER false) - Q_PROPERTY(bool user3 READ user3 USER userFunction()) Q_PROPERTY(QString member1 MEMBER sMember) Q_PROPERTY(QString member2 MEMBER sMember READ member2) Q_PROPERTY(QString member3 MEMBER sMember WRITE setMember3) @@ -744,8 +743,6 @@ signals: private: bool user1() { return true; }; bool user2() { return false; }; - bool user3() { return false; }; - bool userFunction(){ return false; }; template void revisions_T(); QString member2() const { return sMember; } void setMember3( const QString &sVal ) { sMember = sVal; } @@ -919,10 +916,6 @@ void tst_Moc::userProperties() property = mobj->property(mobj->indexOfProperty("user2")); QVERIFY(property.isValid()); QVERIFY(!property.isUser()); - - property = mobj->property(mobj->indexOfProperty("user3")); - QVERIFY(property.isValid()); - QVERIFY(!property.isUser(this)); } void tst_Moc::supportConstSignals() -- cgit v1.2.3