diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-21 12:41:56 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-21 16:33:44 (GMT) |
| commit | 22fdb0300eafc8b0129850af0398fbed1ba59d29 (patch) | |
| tree | abbe5c6d1ae81aae7a139572b05ed962c1b35fab /tools | |
| parent | 8c2284e811d6a1e5d1d5f0703f127e66800baf78 (diff) | |
| download | Qt-22fdb0300eafc8b0129850af0398fbed1ba59d29.zip Qt-22fdb0300eafc8b0129850af0398fbed1ba59d29.tar.gz Qt-22fdb0300eafc8b0129850af0398fbed1ba59d29.tar.bz2 | |
ActiveQt Designer plugin: Load control string correctly.
Task-number: QTBUG-29234
Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
(cherry picked from qttools/8695c1753964eeb06b5d9306010b56be5fc151c0)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp index a6c6749..fa8ecb0 100644 --- a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp +++ b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp @@ -48,6 +48,7 @@ #include <QtDesigner/QDesignerPropertyEditorInterface> #include <QtDesigner/QExtensionManager> +#include <private/qdesigner_utils_p.h> #include <QtCore/QDebug> #include <QtCore/QTimer> @@ -111,7 +112,8 @@ void QAxWidgetPropertySheet::setProperty(int index, const QVariant &value) } // Loading forms: Reload if (name == m_controlProperty) { - const QString clsid = value.toString(); + const qdesigner_internal::PropertySheetStringValue sv = qvariant_cast<qdesigner_internal::PropertySheetStringValue>(value); + const QString clsid = sv.value(); if (clsid.isEmpty() || !axWidget()->loadControl(clsid)) reset(index); else |