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.

3 files changed, 17 insertions, 5 deletions

diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.cpp b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
index 073f125..409a20e 100644
--- a/tools/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -741,7 +741,10 @@ QWidget *QDesignerResource::load(QIODevice *dev, QWidget *parentWidget)
     case LoadPreCheckOk:
         break;
     }
-    return QEditorFormBuilder::load(dev, parentWidget);
+    QWidget *w = QEditorFormBuilder::load(dev, parentWidget);
+    if (w) // Store the class name as 'reset' value for the main container's object name.
+        w->setProperty("_q_classname", w->objectName());
+    return w;
 }
 
 bool QDesignerResource::saveRelative() const
diff --git a/tools/designer/src/lib/shared/qdesigner_command.cpp b/tools/designer/src/lib/shared/qdesigner_command.cpp
index 148b4c8..f4e250d 100644
--- a/tools/designer/src/lib/shared/qdesigner_command.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_command.cpp
@@ -2094,12 +2094,12 @@ void AddContainerWidgetPageCommand::init(QWidget *containerWidget, ContainerType
         case PageContainer:
             setText(QApplication::translate("Command", "Insert Page"));
             m_widget = new QDesignerWidget(formWindow(), m_containerWidget);
-            m_widget->setObjectName(QApplication::translate("Command", "page"));
+            m_widget->setObjectName(QLatin1String("page"));
             break;
         case MdiContainer:
             setText(QApplication::translate("Command", "Insert Subwindow"));
             m_widget = new QDesignerWidget(formWindow(), m_containerWidget);
-            m_widget->setObjectName(QApplication::translate("Command", "subwindow"));
+            m_widget->setObjectName(QLatin1String("subwindow"));
             setPropertySheetWindowTitle(core, m_widget, QApplication::translate("Command", "Subwindow"));
             break;
         case WizardContainer: // Apply style, don't manage
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)) {