diff --git a/filters/sheets/excel/sidewinder/excel.cpp b/filters/sheets/excel/sidewinder/excel.cpp
--- a/filters/sheets/excel/sidewinder/excel.cpp
+++ b/filters/sheets/excel/sidewinder/excel.cpp
@@ -1754,7 +1754,7 @@
     if (ToXRunsPositionIndex > 0) {
         d->richText = QSharedPointer<QTextDocument>(new QTextDocument());
         // also add a textrangemanager, as KoTextWriter assumes one
-        KoTextDocument(d->richText).setTextRangeManager(new KoTextRangeManager);
+        KoTextDocument(d->richText.data()).setTextRangeManager(new KoTextRangeManager);
         d->richText->setPlainText(d->text);
         QTextCursor cursor(d->richText.data());
         //cursor.setVisualNavigation(true);
diff --git a/libs/main/KoFilterManager_p.h b/libs/main/KoFilterManager_p.h
--- a/libs/main/KoFilterManager_p.h
+++ b/libs/main/KoFilterManager_p.h
@@ -29,16 +29,16 @@
 
 #include <QString>
 #include <QStringList>
-#include <QWeakPointer>
+#include <QPointer>
 
 class QListWidget;
 
 class Q_DECL_HIDDEN KoFilterManager::Private
 {
 public:
     bool batch;
     QByteArray importMimeType;
-    QWeakPointer<KoProgressUpdater> progressUpdater;
+    QPointer<KoProgressUpdater> progressUpdater;
 
     Private(KoProgressUpdater *progressUpdater_ = 0)
         : progressUpdater(progressUpdater_)
diff --git a/libs/text/KoList.h b/libs/text/KoList.h
--- a/libs/text/KoList.h
+++ b/libs/text/KoList.h
@@ -23,7 +23,7 @@
 #include "styles/KoListStyle.h"
 
 #include <QMetaType>
-#include <QWeakPointer>
+#include <QPointer>
 #include <QVector>
 #include <QTextList>
 
@@ -75,7 +75,7 @@
     bool contains(QTextList *textList) const;
 
     /// Returns the QTextLists that form this list
-    QVector<QWeakPointer<QTextList> > textLists() const;
+    QVector<QPointer<QTextList> > textLists() const;
 
     QVector<KoListStyle::ListIdType> textListIds() const;
 
diff --git a/libs/text/KoList.cpp b/libs/text/KoList.cpp
--- a/libs/text/KoList.cpp
+++ b/libs/text/KoList.cpp
@@ -45,7 +45,7 @@
     delete d;
 }
 
-QVector<QWeakPointer<QTextList> > KoList::textLists() const
+QVector<QPointer<QTextList> > KoList::textLists() const
 {
     return d->textLists;
 }
diff --git a/libs/text/KoList_p.h b/libs/text/KoList_p.h
--- a/libs/text/KoList_p.h
+++ b/libs/text/KoList_p.h
@@ -30,6 +30,7 @@
 #include <QTextBlock>
 #include <QVector>
 #include <QVariant>
+#include <QPointer>
 #include <QTextList>
 
 class KoListPrivate
@@ -70,7 +71,7 @@
     KoList *q;
     KoList::Type type;
     KoListStyle *style;
-    QVector<QWeakPointer<QTextList> > textLists;
+    QVector<QPointer<QTextList> > textLists;
     QVector<KoListStyle::ListIdType> textListIds;
     const QTextDocument *document;
     QMap<int, QVariant> properties;
diff --git a/libs/text/KoTextDocument.h b/libs/text/KoTextDocument.h
--- a/libs/text/KoTextDocument.h
+++ b/libs/text/KoTextDocument.h
@@ -24,7 +24,7 @@
 #define KOTEXTDOCUMENT_H
 
 #include <QTextDocument>
-#include <QWeakPointer>
+#include <QPointer>
 #include <QAbstractTextDocumentLayout>
 #include <QUrl>
 
@@ -58,7 +58,7 @@
     /// Constructor
     KoTextDocument(const QTextDocument *document); // krazy:exclude=explicit
     /// Constructor
-    KoTextDocument(QWeakPointer<QTextDocument> document); // krazy:exclude=explicit
+    KoTextDocument(QPointer<QTextDocument> document); // krazy:exclude=explicit
 
     /// Destructor
     ~KoTextDocument();
diff --git a/libs/text/KoTextDocument.cpp b/libs/text/KoTextDocument.cpp
--- a/libs/text/KoTextDocument.cpp
+++ b/libs/text/KoTextDocument.cpp
@@ -80,7 +80,7 @@
     Q_ASSERT(m_document);
 }
 
-KoTextDocument::KoTextDocument(QWeakPointer<QTextDocument> document)
+KoTextDocument::KoTextDocument(QPointer<QTextDocument> document)
     : m_document(document.data())
 {
     Q_ASSERT(m_document);
diff --git a/libs/text/KoTextEditor_undo.cpp b/libs/text/KoTextEditor_undo.cpp
--- a/libs/text/KoTextEditor_undo.cpp
+++ b/libs/text/KoTextEditor_undo.cpp
@@ -30,7 +30,7 @@
 #include <klocalizedstring.h>
 
 #include <QTextDocument>
-#include <QWeakPointer>
+#include <QPointer>
 
 #include "TextDebug.h"
 
@@ -105,7 +105,7 @@
             m_p->emitTextFormatChanged();
         }
 
-        QWeakPointer<QTextDocument> m_document;
+        QPointer<QTextDocument> m_document;
         KoTextEditor::Private *m_p;
     };
 
diff --git a/libs/text/KoTextInlineRdf.cpp b/libs/text/KoTextInlineRdf.cpp
--- a/libs/text/KoTextInlineRdf.cpp
+++ b/libs/text/KoTextInlineRdf.cpp
@@ -120,10 +120,10 @@
     QTextBlock block;
 
     // or document and one of bookmark, annotation, kotextmeta, ...
-    QWeakPointer<const QTextDocument> document;
-    QWeakPointer<KoBookmark> bookmark;
-    QWeakPointer<KoAnnotation> annotation;
-    QWeakPointer<KoTextMeta> kotextmeta;
+    QPointer<const QTextDocument> document;
+    QPointer<KoBookmark> bookmark;
+    QPointer<KoAnnotation> annotation;
+    QPointer<KoTextMeta> kotextmeta;
     KoSection *section;
     QTextTableCell cell;
 
diff --git a/libs/text/KoTextMeta.cpp b/libs/text/KoTextMeta.cpp
--- a/libs/text/KoTextMeta.cpp
+++ b/libs/text/KoTextMeta.cpp
@@ -26,7 +26,7 @@
 
 #include <QTextDocument>
 #include <QTextInlineObject>
-#include <QWeakPointer>
+#include <QPointer>
 
 #include "TextDebug.h"
 
@@ -41,7 +41,7 @@
             posInDocument(0) { }
     const QTextDocument *document;
     int posInDocument;
-    QWeakPointer<KoTextMeta> endBookmark;
+    QPointer<KoTextMeta> endBookmark;
     BookmarkType type;
 };
 
diff --git a/libs/text/OdfTextTrackStyles.h b/libs/text/OdfTextTrackStyles.h
--- a/libs/text/OdfTextTrackStyles.h
+++ b/libs/text/OdfTextTrackStyles.h
@@ -26,7 +26,7 @@
 #include <KoStyleManager.h>
 
 #include <QObject>
-#include <QWeakPointer>
+#include <QPointer>
 #include <QSet>
 #include <QTextDocument>
 
@@ -73,7 +73,7 @@
 
 private:
     QList<QTextDocument *> m_documents;
-    QWeakPointer<KoStyleManager> m_styleManager;
+    QPointer<KoStyleManager> m_styleManager;
     ChangeStylesMacroCommand *m_changeCommand;
 };
 
diff --git a/libs/text/commands/ChangeTrackedDeleteCommand.h b/libs/text/commands/ChangeTrackedDeleteCommand.h
--- a/libs/text/commands/ChangeTrackedDeleteCommand.h
+++ b/libs/text/commands/ChangeTrackedDeleteCommand.h
@@ -23,7 +23,7 @@
 #include "KoTextCommandBase.h"
 #include <KoListStyle.h>
 #include <QList>
-#include <QWeakPointer>
+#include <QPointer>
 
 class QTextDocument;
 class QTextCursor;
@@ -52,7 +52,7 @@
     virtual bool mergeWith ( const KUndo2Command *command);
 
 private:
-    QWeakPointer<QTextDocument> m_document;
+    QPointer<QTextDocument> m_document;
     KoDocumentRdfBase *m_rdf;
     KoShapeController *m_shapeController;
     bool m_first;
diff --git a/libs/text/commands/ChangeTrackedDeleteCommand.cpp b/libs/text/commands/ChangeTrackedDeleteCommand.cpp
--- a/libs/text/commands/ChangeTrackedDeleteCommand.cpp
+++ b/libs/text/commands/ChangeTrackedDeleteCommand.cpp
@@ -344,7 +344,7 @@
                 doc->redo(KoTextDocument(doc).textEditor()->cursor());
         }
 
-        QWeakPointer<QTextDocument> m_document;
+        QPointer<QTextDocument> m_document;
     };
 
     if (command->id() != id())
diff --git a/libs/text/commands/DeleteCommand.h b/libs/text/commands/DeleteCommand.h
--- a/libs/text/commands/DeleteCommand.h
+++ b/libs/text/commands/DeleteCommand.h
@@ -27,7 +27,7 @@
 #include <QTextCharFormat>
 #include <QHash>
 #include <QSet>
-#include <QWeakPointer>
+#include <QPointer>
 
 class QTextDocument;
 
@@ -71,7 +71,7 @@
         int childIdx; ///< Position of section in parent's children() list
     };
 
-    QWeakPointer<QTextDocument> m_document;
+    QPointer<QTextDocument> m_document;
     KoShapeController *m_shapeController;
 
     QSet<KoInlineObject *> m_invalidInlineObjects;
diff --git a/libs/text/commands/DeleteCommand.cpp b/libs/text/commands/DeleteCommand.cpp
--- a/libs/text/commands/DeleteCommand.cpp
+++ b/libs/text/commands/DeleteCommand.cpp
@@ -515,7 +515,7 @@
     public:
         UndoTextCommand(QTextDocument *document, KUndo2Command *parent = 0)
         : KUndo2Command(kundo2_i18n("Text"), parent),
-        m_document(document)
+          m_document(document)
         {}
 
         void undo() {
@@ -530,7 +530,7 @@
                 doc->redo(KoTextDocument(doc).textEditor()->cursor());
         }
 
-        QWeakPointer<QTextDocument> m_document;
+        QPointer<QTextDocument> m_document;
     };
 
     KoTextEditor *textEditor = KoTextDocument(m_document).textEditor();
diff --git a/libs/text/commands/InsertDeleteChangesCommand.h b/libs/text/commands/InsertDeleteChangesCommand.h
--- a/libs/text/commands/InsertDeleteChangesCommand.h
+++ b/libs/text/commands/InsertDeleteChangesCommand.h
@@ -21,7 +21,7 @@
 #define INSERTDELETECHANGESCOMMAND_H
 
 #include <kundo2command.h>
-#include <QWeakPointer>
+#include <QPointer>
 
 class QTextDocument;
 
@@ -32,7 +32,7 @@
     void redo();
 
 private:
-    QWeakPointer<QTextDocument> m_document;
+    QPointer<QTextDocument> m_document;
     void insertDeleteChanges();
 };
 
diff --git a/libs/text/commands/InsertNoteCommand.h b/libs/text/commands/InsertNoteCommand.h
--- a/libs/text/commands/InsertNoteCommand.h
+++ b/libs/text/commands/InsertNoteCommand.h
@@ -25,7 +25,7 @@
 
 #include <kundo2command.h>
 
-#include <QWeakPointer>
+#include <QPointer>
 
 class QTextDocument;
 
@@ -41,7 +41,7 @@
 
     KoInlineNote *m_inlineNote;
 private:
-    QWeakPointer<QTextDocument> m_document;
+    QPointer<QTextDocument> m_document;
     bool m_first;
     int m_framePosition; // a cursor position inside the frame at the time of creation
 };
diff --git a/libs/text/commands/RemoveDeleteChangesCommand.h b/libs/text/commands/RemoveDeleteChangesCommand.h
--- a/libs/text/commands/RemoveDeleteChangesCommand.h
+++ b/libs/text/commands/RemoveDeleteChangesCommand.h
@@ -21,7 +21,7 @@
 #define REMOVEDELETECHANGESCOMMAND_H
 
 #include <kundo2command.h>
-#include <QWeakPointer>
+#include <QPointer>
 
 class QTextDocument;
 
@@ -32,7 +32,7 @@
     void redo();
 
 private:
-    QWeakPointer<QTextDocument> m_document;
+    QPointer<QTextDocument> m_document;
     void removeDeleteChanges();
 };
 
diff --git a/libs/text/commands/TextPasteCommand.h b/libs/text/commands/TextPasteCommand.h
--- a/libs/text/commands/TextPasteCommand.h
+++ b/libs/text/commands/TextPasteCommand.h
@@ -21,7 +21,7 @@
 #define TEXTPASTECOMMAND_H
 
 #include <QClipboard>
-#include <QWeakPointer>
+#include <QPointer>
 #include <kundo2command.h>
 
 class QTextDocument;
@@ -46,7 +46,7 @@
 
 private:
     const QMimeData *m_mimeData;
-    QWeakPointer<QTextDocument> m_document;
+    QPointer<QTextDocument> m_document;
     KoDocumentRdfBase *m_rdf;
     KoShapeController *m_shapeController;
     KoCanvasBase *m_canvas;
diff --git a/plugins/textshape/TextTool.h b/plugins/textshape/TextTool.h
--- a/plugins/textshape/TextTool.h
+++ b/plugins/textshape/TextTool.h
@@ -32,13 +32,14 @@
 #include <KoTextCommandBase.h>
 #include <KoUnit.h>
 #include <KoBorder.h>
+#include <KoTextEditor.h>
 
 #include <QClipboard>
 #include <QHash>
 #include <QTextBlock>
 #include <QTextCursor>
 #include <QTimer>
-#include <QWeakPointer>
+#include <QPointer>
 #include <QRectF>
 #include <QPointer>
 
@@ -346,8 +347,8 @@
 
     TextShape *m_textShape; // where caret of m_textEditor currently is
     KoTextShapeData *m_textShapeData; // where caret of m_textEditor currently is
-    QWeakPointer<KoTextEditor> m_textEditor;
-    QWeakPointer<KoTextEditor> m_oldTextEditor;
+    QPointer<KoTextEditor> m_textEditor;
+    QPointer<KoTextEditor> m_oldTextEditor;
     KoChangeTracker *m_changeTracker;
     KoUnit m_unit;
     bool m_allowActions;
diff --git a/plugins/textshape/TextTool.cpp b/plugins/textshape/TextTool.cpp
--- a/plugins/textshape/TextTool.cpp
+++ b/plugins/textshape/TextTool.cpp
@@ -113,7 +113,7 @@
 {
 public:
 
-    TextToolSelection(QWeakPointer<KoTextEditor> editor)
+    TextToolSelection(QPointer<KoTextEditor> editor)
         : KoToolSelection(0)
         , m_editor(editor)
     {
@@ -127,7 +127,7 @@
         return false;
     }
 
-    QWeakPointer<KoTextEditor> m_editor;
+    QPointer<KoTextEditor> m_editor;
 };
 
 static bool hit(const QKeySequence &input, KStandardShortcut::StandardShortcut shortcut)