diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
index 65f2c8468a4..b88646c3052 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
@@ -101,7 +101,7 @@ public:
 
         // Open file
         QScopedPointer<TextEditor::BaseTextEditorWidget> editorWidget(
-            new TextEditor::PlainTextEditorWidget);
+            new TextEditor::PlainTextEditorWidget(new TextEditor::PlainTextDocument));
         QString error;
         editorWidget->open(&error, document->fileName(), document->fileName());
         QVERIFY(error.isEmpty());
diff --git a/src/plugins/qnx/bardescriptoreditorwidget.cpp b/src/plugins/qnx/bardescriptoreditorwidget.cpp
index 8a934c866e8..70ed4977164 100644
--- a/src/plugins/qnx/bardescriptoreditorwidget.cpp
+++ b/src/plugins/qnx/bardescriptoreditorwidget.cpp
@@ -49,6 +49,7 @@
 #include <texteditor/plaintexteditor.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/texteditorconstants.h>
+#include <texteditor/normalindenter.h>
 #include <utils/qtcassert.h>
 
 using namespace Qnx;
@@ -165,7 +166,9 @@ void BarDescriptorEditorWidget::initAssetsPage()
 
 void BarDescriptorEditorWidget::initSourcePage()
 {
-    m_xmlSourceWidget = new TextEditor::PlainTextEditorWidget(this);
+    auto doc = new TextEditor::PlainTextDocument;
+    doc->setIndenter(new TextEditor::NormalIndenter);
+    m_xmlSourceWidget = new TextEditor::PlainTextEditorWidget(doc, this);
     addWidget(m_xmlSourceWidget);
 
     TextEditor::TextEditorSettings::initializeEditor(m_xmlSourceWidget);
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp
index 64c84b2dfba..5ed412f2129 100644
--- a/src/plugins/texteditor/plaintexteditor.cpp
+++ b/src/plugins/texteditor/plaintexteditor.cpp
@@ -66,14 +66,6 @@ PlainTextEditor::PlainTextEditor(PlainTextEditorWidget *editor)
     setDuplicateSupported(true);
 }
 
-PlainTextEditorWidget::PlainTextEditorWidget(QWidget *parent)
-  : BaseTextEditorWidget(new PlainTextDocument(), parent)
-{
-    // Currently only "normal" indentation is supported.
-    baseTextDocument()->setIndenter(new NormalIndenter);
-    ctor();
-}
-
 PlainTextEditorWidget::PlainTextEditorWidget(PlainTextDocument *doc, QWidget *parent)
     : BaseTextEditorWidget(doc, parent)
 {
diff --git a/src/plugins/texteditor/plaintexteditor.h b/src/plugins/texteditor/plaintexteditor.h
index 7ebb4e2dc2b..c2db546ca56 100644
--- a/src/plugins/texteditor/plaintexteditor.h
+++ b/src/plugins/texteditor/plaintexteditor.h
@@ -59,7 +59,6 @@ class TEXTEDITOR_EXPORT PlainTextEditorWidget : public BaseTextEditorWidget
     Q_OBJECT
 
 public:
-    PlainTextEditorWidget(QWidget *parent = 0);
     PlainTextEditorWidget(PlainTextDocument *doc, QWidget *parent = 0);
     PlainTextEditorWidget(PlainTextEditorWidget *other);
 
diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp
index c8af5fbcf58..69b5ca1ad80 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.cpp
+++ b/src/plugins/texteditor/plaintexteditorfactory.cpp
@@ -30,6 +30,7 @@
 #include "plaintexteditorfactory.h"
 #include "plaintexteditor.h"
 #include "basetextdocument.h"
+#include "normalindenter.h"
 #include "texteditoractionhandler.h"
 #include "texteditorconstants.h"
 #include "texteditorplugin.h"
@@ -60,12 +61,14 @@ PlainTextEditorFactory::PlainTextEditorFactory(QObject *parent)
 
 Core::IEditor *PlainTextEditorFactory::createEditor()
 {
-    PlainTextEditorWidget *rc = new PlainTextEditorWidget();
-    TextEditorSettings::initializeEditor(rc);
-    connect(rc, SIGNAL(configured(Core::IEditor*)),
+    auto doc = new PlainTextDocument;
+    doc->setIndenter(new NormalIndenter);
+    auto widget = new PlainTextEditorWidget(doc);
+    TextEditorSettings::initializeEditor(widget);
+    connect(widget, SIGNAL(configured(Core::IEditor*)),
             this, SLOT(updateEditorInfoBar(Core::IEditor*)));
-    updateEditorInfoBar(rc->editor());
-    return rc->editor();
+    updateEditorInfoBar(widget->editor());
+    return widget->editor();
 }
 
 /*!