diff options
-rw-r--r-- | dependencies.yaml | 2 | ||||
-rw-r--r-- | src/activeqt/container/qaxbase.cpp | 8 | ||||
-rw-r--r-- | src/activeqt/control/qaxserver.cpp | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index e02a885..27b9ae8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: 56f40cdca6b589beec5c2cb803633985ca4c59d1 + ref: d0689ec867244a25635fb9504f2e6ff6e5c4a77b required: true diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 6e20ae4..3845916 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -2895,7 +2895,6 @@ static void addMetaProperty(QMetaObjectBuilder &builder, const QByteArray &name, propertyBuilder.setDesignable(flags & Designable); propertyBuilder.setScriptable(flags & Scriptable); propertyBuilder.setStored(flags & Stored); - propertyBuilder.setEditable(flags & Editable); propertyBuilder.setUser(flags & User); } @@ -3513,13 +3512,6 @@ int QAxBasePrivate::qtMetaCall(QMetaObject::Call call, int id, void **v) case QMetaObject::ResetProperty: id = q->internalProperty(call, id, v); break; - case QMetaObject::QueryPropertyScriptable: - case QMetaObject::QueryPropertyDesignable: - case QMetaObject::QueryPropertyStored: - case QMetaObject::QueryPropertyEditable: - case QMetaObject::QueryPropertyUser: - id -= mo->propertyCount(); - break; default: break; } diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp index 7932b1d..a103290 100644 --- a/src/activeqt/control/qaxserver.cpp +++ b/src/activeqt/control/qaxserver.cpp @@ -962,9 +962,9 @@ static HRESULT classIDL(QObject *o, const QMetaObject *mo, const QString &classN out << "\t\t[id(" << id << ')'; if (!property.isWritable()) out << ", readonly"; - if (isBindable && property.isScriptable(o)) + if (isBindable && property.isScriptable()) out << ", bindable"; - if (!property.isDesignable(o)) + if (!property.isDesignable()) out << ", nonbrowsable"; if (isBindable) out << ", requestedit"; |