Qt Designer: Implement property() for QAxWidgetPropertySheet.

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>
(cherry picked from qttools/611ac50c1ed80bd6c6c15f2b39e720b6f7c1acb8)

2 files changed, 10 insertions, 0 deletions

diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp
index b7cb6808e7..d8a2558e36 100644
--- a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp
+++ b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp
@@ -100,6 +100,15 @@ bool QAxWidgetPropertySheet::reset(int index)
     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)
 {
 
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
index 0bd4b87f20..402ef596da 100644
--- a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
+++ b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
@@ -66,6 +66,7 @@ public:
     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;