From 07af4aa9ea85de65a15532fe86fc76bc185104b0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 14 Mar 2011 12:21:25 +0100
Subject: [PATCH] Designer: Fix warning about missing editor factory on 'recent
file'
caused by mismatched ID's of editor and editor factory.
---
src/plugins/designer/designerconstants.h | 1 -
src/plugins/designer/formeditorfactory.cpp | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h
index a14c4ee4ab4..cdb9f8243f1 100644
--- a/src/plugins/designer/designerconstants.h
+++ b/src/plugins/designer/designerconstants.h
@@ -42,7 +42,6 @@ namespace Constants {
const char * const INFO_READ_ONLY = "DesignerXmlEditor.ReadOnly";
const char * const K_DESIGNER_XML_EDITOR_ID = "FormEditor.DesignerXmlEditor";
const char * const C_DESIGNER_XML_EDITOR = "Designer Xml Editor";
-const char * const DESIGNER_XML_EDITOR_ID ="DesignerXmlEditor";
const char * const C_DESIGNER_XML_DISPLAY_NAME = QT_TRANSLATE_NOOP("Designer", "Form Editor");
const char * const SETTINGS_CATEGORY = "P.Designer";
diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp
index 5ff57e40c7c..8917c8fd811 100644
--- a/src/plugins/designer/formeditorfactory.cpp
+++ b/src/plugins/designer/formeditorfactory.cpp
@@ -65,7 +65,7 @@ FormEditorFactory::FormEditorFactory()
QString FormEditorFactory::id() const
{
- return QLatin1String(DESIGNER_XML_EDITOR_ID);
+ return QLatin1String(K_DESIGNER_XML_EDITOR_ID);
}
QString FormEditorFactory::displayName() const
--
GitLab