diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 22:03:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 22:03:40 (GMT) |
| commit | 3030bb7cfecf5db7cc8de14791369a015f5abb32 (patch) | |
| tree | 4df0c68ba2b522cc422c933d7695d59b913741b4 /tools/designer/src/components/formeditor | |
| parent | 31e21db28f97a0c6b7bbe80edf531dbbce2b02ed (diff) | |
| parent | 8a9dd3f463a312963dc420ee83ca75fd52e24463 (diff) | |
| download | Qt-3030bb7cfecf5db7cc8de14791369a015f5abb32.zip Qt-3030bb7cfecf5db7cc8de14791369a015f5abb32.tar.gz Qt-3030bb7cfecf5db7cc8de14791369a015f5abb32.tar.bz2 | |
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.
Diffstat (limited to 'tools/designer/src/components/formeditor')
| -rw-r--r-- | tools/designer/src/components/formeditor/qdesigner_resource.cpp | 5 |
1 files changed, 4 insertions, 1 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 |