Access the control property of the QAxWidget directly.
Task-number: QTBUG-34592
Change-Id: I7d0971ad8fc265d0443da7ae72330e2b7f3a8d70
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
return true;
}
+QVariant QAxWidgetPropertySheet::property(int index) const
+{
+ // QTBUG-34592, accessing the 'control' property via meta object system
+ // may cause crashes during loading for some controls.
+ return propertyName(index) == m_controlProperty ?
+ QVariant(axWidget()->control()) :
+ QDesignerPropertySheet::property(index);
+}
+
void QAxWidgetPropertySheet::setProperty(int index, const QVariant &value)
{
explicit QAxWidgetPropertySheet(QDesignerAxWidget *object, QObject *parent = 0);
virtual bool isEnabled(int index) const;
+ virtual QVariant property(int index) const;
virtual void setProperty(int index, const QVariant &value);
virtual bool reset(int index);
int indexOf(const QString &name) const;