summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-01-21 13:41:56 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-21 13:55:12 +0100
commit8695c1753964eeb06b5d9306010b56be5fc151c0 (patch)
tree7463cf4acef7f535c24f4558ca2fbdca8526187c
parenta7d61534acdb90b925d7f250665dcd30c3f37668 (diff)
downloadqttools-8695c1753964eeb06b5d9306010b56be5fc151c0.tar.gz
ActiveQt Designer plugin: Load control string correctly.
Task-number: QTBUG-29234 Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
-rw-r--r--src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp
index 39a5c5614..354943ff5 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp
+++ b/src/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