Fixes: Session loading does not restore form files

RevBy: Eike
Details: Make form editor factory and form editor return the same editor kind.

3 files changed, 2 insertions, 3 deletions

diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h
index f403f6322f..6d5f4a4695 100644
--- a/src/plugins/designer/designerconstants.h
+++ b/src/plugins/designer/designerconstants.h
@@ -42,7 +42,6 @@ const char * const C_FORMEDITOR         = "Formeditor";
 const char * const T_FORMEDITOR         = "Formeditor.Toolbar";
 const char * const M_FORMEDITOR         = "Formeditor.Menu";
 const char * const M_FORMEDITOR_PREVIEW = "Formeditor.Menu.Preview";
-const char * const C_FORMWINDOW         = "Formwindow";
 
 // Wizard type
 const char * const FORM_FILE_TYPE       = "Qt4FormFiles";
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 4ab3c61694..ef5e3153f4 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -546,7 +546,7 @@ void FormEditorW::currentEditorChanged(Core::IEditor *editor)
         qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount();
 
     // Deactivate Designer if a non-form is being edited
-    if (editor && !qstrcmp(editor->kind(), Constants::C_FORMWINDOW)) {
+    if (editor && !qstrcmp(editor->kind(), Constants::C_FORMEDITOR)) {
         FormWindowEditor *fw = qobject_cast<FormWindowEditor *>(editor);
         QTC_ASSERT(fw, return);
         fw->activate();
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp
index 65eaf8aceb..a683dccd86 100644
--- a/src/plugins/designer/formwindoweditor.cpp
+++ b/src/plugins/designer/formwindoweditor.cpp
@@ -260,7 +260,7 @@ Core::IFile *FormWindowEditor::file()
 
 const char *FormWindowEditor::kind() const
 {
-    return C_FORMWINDOW;
+    return C_FORMEDITOR;
 }
 
 QString FormWindowEditor::displayName() const