1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp
index beace0702e..278cb065f4 100644
--- a/src/plugins/designer/formeditorfactory.cpp
+++ b/src/plugins/designer/formeditorfactory.cpp
@@ -1,18 +1,16 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "designertr.h"
 #include "formeditorfactory.h"
-#include "formeditorw.h"
-#include "formwindoweditor.h"
+
+#include "designerconstants.h"
+#include "designertr.h"
+#include "formeditor.h"
 
 #include <coreplugin/coreconstants.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/fsengine/fileiconprovider.h>
 
-#include <QCoreApplication>
-#include <QDebug>
-
 using namespace Core;
 using namespace Designer::Constants;
 using namespace Utils;
@@ -25,7 +23,7 @@ FormEditorFactory::FormEditorFactory()
     setId(K_DESIGNER_XML_EDITOR_ID);
     setDisplayName(Tr::tr(C_DESIGNER_XML_DISPLAY_NAME));
     addMimeType(FORM_MIMETYPE);
-    setEditorCreator([] { return  FormEditorW::createEditor(); });
+    setEditorCreator([] { return Designer::Internal::createEditor(); });
 
     FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_UI, "ui");
 }