From 088fe949570ce31aba6d9b97a4084195cbb3b9e1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 22 Oct 2013 16:52:21 +0200 Subject: Fix resetting of string properties. Task-number: QTBUG-34171 Change-Id: Ib5fe8194d891eb999e41bafde19834be56c84103 Reviewed-by: Jarek Kobus (cherry picked from qttools/78d8ee2513bdf52da2e0141be93dfe7bab8a1488) --- tools/designer/src/lib/shared/qdesigner_propertysheet.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp index f4eb518..09d2a2f 100644 --- a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp +++ b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp @@ -1202,6 +1202,12 @@ bool QDesignerPropertySheet::reset(int index) const QVariant classNameDefaultV = d->m_object->property("_q_classname"); if (classNameDefaultV.isValid()) value.setValue(classNameDefaultV.toString()); + } else if (!isAdditionalProperty(index)) { + const QDesignerMetaPropertyInterface *property = d->m_meta->property(index); + if ((property->accessFlags() & QDesignerMetaPropertyInterface::ResetAccess) && property->reset(d->m_object)) + value.setValue(property->read(d->m_object).toString()); + else + return false; } setProperty(index, QVariant::fromValue(value)); return true; -- cgit v0.12