diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-03-18 16:22:50 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-18 16:58:40 +0100 |
commit | 9ee8213c7becfdf906ca781df4895e18b273e023 (patch) | |
tree | 600612ebfcfd7568e171f44ca381a5cedb637299 | |
parent | be88fd8f4eb8d50452b4c307d11e1debea6f7605 (diff) | |
download | qttools-9ee8213c7becfdf906ca781df4895e18b273e023.tar.gz |
Store changed status of the QAxWidget's "control" property correctly.
Handle the case of it being PropertySheetStringValue.
Task-number: QTBUG-37602
Change-Id: Iff54d6409ffabf48406fcfec96289848a42b3e55
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
-rw-r--r-- | src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp index 6b03b4796..776034ec1 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp @@ -58,6 +58,13 @@ QT_BEGIN_NAMESPACE const char *QAxWidgetPropertySheet::controlPropertyName = "control"; +static QString designerPropertyToString(const QVariant &value) +{ + return value.canConvert<qdesigner_internal::PropertySheetStringValue>() ? + qvariant_cast<qdesigner_internal::PropertySheetStringValue>(value).value() : + value.toString(); +} + QAxWidgetPropertySheet::QAxWidgetPropertySheet(QDesignerAxWidget *object, QObject *parent) : QDesignerPropertySheet(object, parent), m_controlProperty(controlPropertyName), @@ -121,9 +128,7 @@ void QAxWidgetPropertySheet::setProperty(int index, const QVariant &value) } // Loading forms: Reload if (name == m_controlProperty) { - const QString clsid = value.canConvert<qdesigner_internal::PropertySheetStringValue>() ? - qvariant_cast<qdesigner_internal::PropertySheetStringValue>(value).value() : - value.toString(); + const QString clsid = designerPropertyToString(value); if (clsid.isEmpty() || !axWidget()->loadControl(clsid)) reset(index); else @@ -182,7 +187,7 @@ void QAxWidgetPropertySheet::reloadPropertySheet(const struct SavedProperties &p continue; } if (name == QLatin1String(controlPropertyName)) { - sheet->setChanged(index, !i.value().toString().isEmpty()); + sheet->setChanged(index, !designerPropertyToString(i.value()).isEmpty()); continue; } sheet->setChanged(index, true); |