From e9131897e4422e9bcf771139b5edfc3f3a10254a Mon Sep 17 00:00:00 2001
From: Sergio Martins <sergio.martins@kdab.com>
Date: Sun, 26 Jul 2020 16:07:36 +0100
Subject: [PATCH] qml: Remove QWidget'isms from DockWidgetBase

---
 src/DockWidgetBase.cpp                     |  4 ++--
 src/private/quick/QWidgetAdapter_quick.cpp | 10 ++++++++++
 src/private/quick/QWidgetAdapter_quick_p.h |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/DockWidgetBase.cpp b/src/DockWidgetBase.cpp
index a6997691..a9b825df 100644
--- a/src/DockWidgetBase.cpp
+++ b/src/DockWidgetBase.cpp
@@ -389,7 +389,7 @@ void DockWidgetBase::show()
         // This reduces flickering on some platforms
         morphIntoFloatingWindow();
     } else {
-        QWidget::show();
+        QWidgetOrQuick::show();
     }
 }
 
@@ -624,7 +624,7 @@ void DockWidgetBase::Private::maybeRestoreToPreviousPosition()
 
     Frame *frame = q->frame();
 
-    if (frame && frame->QWidget::parentWidget() == DockRegistry::self()->layoutForItem(layoutItem)) {
+    if (frame && frame->QWidgetAdapter::parentWidget() == DockRegistry::self()->layoutForItem(layoutItem)) {
         // There's a frame already. Means the DockWidget was hidden instead of closed.
         // Nothing to do, the dock widget will simply be shown
         qCDebug(placeholder) << Q_FUNC_INFO << "Already had frame.";
diff --git a/src/private/quick/QWidgetAdapter_quick.cpp b/src/private/quick/QWidgetAdapter_quick.cpp
index 5905c9b1..83fe4b95 100644
--- a/src/private/quick/QWidgetAdapter_quick.cpp
+++ b/src/private/quick/QWidgetAdapter_quick.cpp
@@ -147,6 +147,16 @@ void QWidgetAdapter::setParent(QQuickItem *p)
     QQuickItem::setParentItem(p);
 }
 
+void QWidgetAdapter::activateWindow()
+{
+    qWarning() << Q_FUNC_INFO << "Implement me";
+}
+
+void QWidgetAdapter::setSizePolicy(QSizePolicy)
+{
+    qWarning() << Q_FUNC_INFO << "Implement me";
+}
+
 void QWidgetAdapter::setFlag(Qt::WindowType f, bool on)
 {
     if (auto w = windowHandle()) {
diff --git a/src/private/quick/QWidgetAdapter_quick_p.h b/src/private/quick/QWidgetAdapter_quick_p.h
index 217d5af8..e370640e 100644
--- a/src/private/quick/QWidgetAdapter_quick_p.h
+++ b/src/private/quick/QWidgetAdapter_quick_p.h
@@ -111,6 +111,8 @@ public:
     void move(int x, int y);
 
     void setParent(QQuickItem*);
+    void activateWindow();
+    void setSizePolicy(QSizePolicy);
 
 protected:
     void raiseAndActivate();