Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-staging1

2 files changed, 10 insertions, 4 deletions

diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 089e04a..ef2b223 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -228,7 +228,8 @@ Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook
 
     \value ReadOnly Indicates that the model is readonly.
 
-    \value HideNameFilterDetails Indicates if the is hidden or not.
+    \value HideNameFilterDetails Indicates if the file name filter details are
+    hidden or not.
 
     \value DontUseSheet In previous versions of Qt, the static
     functions would create a sheet by default if the static function
diff --git a/tools/designer/src/lib/uilib/properties.cpp b/tools/designer/src/lib/uilib/properties.cpp
index 8eccee1..615aa8a 100644
--- a/tools/designer/src/lib/uilib/properties.cpp
+++ b/tools/designer/src/lib/uilib/properties.cpp
@@ -655,16 +655,21 @@ DomProperty *variantToDomProperty(QAbstractFormBuilder *afb, const QMetaObject *
     case QVariant::Brush:
         dom_prop->setElementBrush(afb->saveBrush(qvariant_cast<QBrush>(v)));
         break;
-    default:
+    default: {
+        const bool hadAttributeStdset = dom_prop->hasAttributeStdset();
+        const bool attributeStdset = dom_prop->attributeStdset();
         delete dom_prop;
         if (afb->resourceBuilder()->isResourceType(v)) {
             dom_prop = afb->resourceBuilder()->saveResource(afb->workingDirectory(), v);
-            if (dom_prop)
+            if (dom_prop) {
                 dom_prop->setAttributeName(pname);
+                if (hadAttributeStdset)
+                    dom_prop->setAttributeStdset(attributeStdset);
+            }
             break;
         }
         uiLibWarning(msgCannotWriteProperty(pname, v));
-        return 0;
+    } return 0;
     }
     return dom_prop;
 }