diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-10 15:57:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-11 08:34:20 +0200 |
| commit | 2a6a3f0b6b6b1317a9fb2fd55202e4dbadbc3795 (patch) | |
| tree | 6ed59d12db1f9e519d4941bb2f8f564d01764cf1 | |
| parent | b6b5de9907479d9c52ad12d3adc0952192cac492 (diff) | |
QAxServer: Enable Q_INVOKABLE methods.
Task-number: QTBUG-26011
Change-Id: I2d91941e460e816dc6e518e4a3f059a40343bd83
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index daf2d77..f39c609 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -2343,7 +2343,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid, // get slot info QMetaMethod slot(mo->method(index)); - Q_ASSERT(slot.methodType() == QMetaMethod::Slot); + Q_ASSERT(slot.methodType() == QMetaMethod::Slot || slot.methodType() == QMetaMethod::Method); QByteArray type = slot.typeName(); name = slot.methodSignature(); nameLength = name.indexOf('('); |