diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-07 19:35:53 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-18 12:00:49 +0200 |
| commit | 02d4cd7ac27d83a98f5c1b1925c21df122618e26 (patch) | |
| tree | 8d8f334630014509672dcda5c350a703eb44dcd5 /src/activeqt/container/qaxbase.h | |
| parent | 2013def33a8601b9121844cbb3e4ddda827210a7 (diff) | |
| download | qtactiveqt-02d4cd7ac27d83a98f5c1b1925c21df122618e26.tar.gz | |
Port ActiveQt to meta-object revision 7
Change-Id: Ia87652ade4a2905d6feecd852403af9a9c705976
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/activeqt/container/qaxbase.h')
| -rw-r--r-- | src/activeqt/container/qaxbase.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/activeqt/container/qaxbase.h b/src/activeqt/container/qaxbase.h index cb8a7f1..b665c25 100644 --- a/src/activeqt/container/qaxbase.h +++ b/src/activeqt/container/qaxbase.h @@ -98,6 +98,7 @@ public: virtual const QMetaObject *metaObject() const; virtual int qt_metacall(QMetaObject::Call, int, void **); + static int qt_static_metacall(QAxBase *, QMetaObject::Call, int, void **); virtual QObject *qObject() const = 0; virtual const char *className() const = 0; @@ -143,6 +144,15 @@ protected: void connectNotify(); long indexOfVerb(const QString &verb) const; + virtual const QMetaObject *fallbackMetaObject() const = 0; + + struct qt_meta_stringdata_QAxBase_t { + QByteArrayData data[13]; + char stringdata[88]; + }; + static const qt_meta_stringdata_QAxBase_t qt_meta_stringdata_QAxBase; + static const uint qt_meta_data_QAxBase[]; + private: friend class QAxEventSink; friend void *qax_createObjectWrapper(int, IUnknown*); @@ -154,8 +164,6 @@ private: int internalProperty(QMetaObject::Call, int index, void **v); int internalInvoke(QMetaObject::Call, int index, void **v); bool dynamicCallHelper(const char *name, void *out, QList<QVariant> &var, QByteArray &type); - - static QMetaObject staticMetaObject; }; #if defined Q_CC_MSVC && _MSC_VER < 1300 |