summaryrefslogtreecommitdiffstats
path: root/src/designer/src/lib/uilib/formbuilder.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-08-23 15:41:54 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-26 11:38:32 +0200
commit50b8ab3f09f1c52b1cbe0cdf20bbae3419c8f0e8 (patch)
treed5bf4e9667e1f9fee1ac98424049a6662f6028f2 /src/designer/src/lib/uilib/formbuilder.cpp
parent0e6fa41c075814a20c935544c786b1920c2e12ee (diff)
Fix QUiLoader not applying empty string properties.
Introduced by 6b02fc50ec6a5236f628b08ebeca50e62b22f362 . Task-number: QTBUG-33130 Change-Id: Ida5ac8c3bf043cb04650680a2fc3777eff3b3f3f Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/designer/src/lib/uilib/formbuilder.cpp')
-rw-r--r--src/designer/src/lib/uilib/formbuilder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp
index dfa10807d..90b114b9f 100644
--- a/src/designer/src/lib/uilib/formbuilder.cpp
+++ b/src/designer/src/lib/uilib/formbuilder.cpp
@@ -523,7 +523,7 @@ void QFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &proper
const DomPropertyList::const_iterator cend = properties.constEnd();
for (DomPropertyList::const_iterator it = properties.constBegin(); it != cend; ++it) {
const QVariant v = toVariant(o->metaObject(), *it);
- if (v.isNull())
+ if (!v.isValid()) // QTBUG-33130, do not fall for QVariant(QString()).isNull() == true.
continue;
const QString attributeName = (*it)->attributeName();