Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  Designer: Remember default of main container's object name.
  Designer: Do not translate page object names of QMdiArea.

1 files changed, 11 insertions, 2 deletions

diff --git a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp
index babe20e..27527da 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp
@@ -1195,8 +1195,17 @@ bool QDesignerPropertySheet::reset(int index)
 {
     if (d->invalidIndex(Q_FUNC_INFO, index))
         return false;
-    if (d->isStringProperty(index))
-        setProperty(index, QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
+    if (d->isStringProperty(index)) {
+        qdesigner_internal::PropertySheetStringValue value;
+        // Main container: Reset to stored class name as not to change the file names generated by uic.
+        if (propertyName(index) == QLatin1String("objectName")) {
+            const QVariant classNameDefaultV = d->m_object->property("_q_classname");
+            if (classNameDefaultV.isValid())
+                value.setValue(classNameDefaultV.toString());
+        }
+        setProperty(index, QVariant::fromValue(value));
+        return true;
+    }
     if (d->isKeySequenceProperty(index))
         setProperty(index, QVariant::fromValue(qdesigner_internal::PropertySheetKeySequenceValue()));
     if (d->isResourceProperty(index)) {