Merge remote-tracking branch 'origin/qds/dev'

Conflicts: src/plugins/qmldesigner/CMakeLists.txt

Change-Id: I250c8e5284ddb0f335c440999b8920762419c89b

src/plugins/texteditor/texteditor.cpp

@@ -1314,15 +1314,15 @@ TextEditorWidget::TextEditorWidget(QWidget *parent)
 {
     // "Needed", as the creation below triggers ChildEvents that are
     // passed to this object's event() which uses 'd'.
-    d = nullptr;
-    d = new TextEditorWidgetPrivate(this);
-
+    d = std::make_unique<Internal::TextEditorWidgetPrivate>(this);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
     setLayoutDirection(Qt::LeftToRight);
     viewport()->setMouseTracking(true);
     setFrameStyle(QFrame::NoFrame);
 }
 
+TextEditorWidget::~TextEditorWidget() = default;
+
 void TextEditorWidget::setTextDocument(const QSharedPointer<TextDocument> &doc)
 {
     d->setDocument(doc);
@@ -1501,12 +1501,6 @@ void TextEditorWidgetPrivate::setDocument(const QSharedPointer<TextDocument> &do
     setupFromDefinition(currentDefinition());
 }
 
-TextEditorWidget::~TextEditorWidget()
-{
-    delete d;
-    d = nullptr;
-}
-
 void TextEditorWidget::print(QPrinter *printer)
 {
     const bool oldFullPage = printer->fullPage();
@@ -6391,7 +6385,7 @@ void TextEditorWidgetPrivate::paintRevisionMarker(QPainter &painter,
 
 void TextEditorWidget::extraAreaPaintEvent(QPaintEvent *e)
 {
-    ExtraAreaPaintEventData data(this, d);
+    ExtraAreaPaintEventData data(this, d.get());
     QTC_ASSERT(data.documentLayout, return);
 
     QPainter painter(d->m_extraArea);
@@ -10019,7 +10013,7 @@ void TextEditorWidget::setupGenericHighlighter()
     setLineSeparatorsAllowed(true);
 
     connect(textDocument(), &IDocument::filePathChanged,
-            d, &TextEditorWidgetPrivate::reconfigure);
+            d.get(), &TextEditorWidgetPrivate::reconfigure);
 }
 
 //