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>

diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp
index dfa1080..90b114b 100644 (file)
--- 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();