summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>2015-05-11 13:11:59 +0200
committerGabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>2015-05-13 12:08:57 +0000
commit629f5a46d531886cebe654a4ddb9269b62874e6a (patch)
treedd5f9168e9a1eda8d1a6c8d84b2ccdec2c2f68a0 /tests
parentd6efc6b543d1a8fe2e1232750a98e396db07be0f (diff)
moc: Generate qt_static_metacall for creatable-only gadgets
Prior to this, moc would not generate the function unless the gadget class had a property or a non-constructor invokable. Change-Id: Ic020ea5f8f59702f5e9e194a46e26850e53e5cfe Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 7fa5de3377..8bef678af9 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -90,13 +90,15 @@ struct QTBUG_31218_Derived : QTBUG_31218<-1<0> {};
class CreatableGadget
{
Q_GADGET
- Q_PROPERTY(int a MEMBER a)
public:
- Q_INVOKABLE CreatableGadget() : a(0xdeadbeef) { }
-
- int a;
+ Q_INVOKABLE CreatableGadget()
+ {
+ CreatableGadget::qt_static_metacall((QObject*)this, QMetaObject::ReadProperty, -1, Q_NULLPTR);
+ }
};
+CreatableGadget creatableGadget; // Force the compiler to use the constructor
+
struct MyStruct {};
struct MyStruct2 {};