diff --git a/src/DockWidgetBase.cpp b/src/DockWidgetBase.cpp
index bda31d9e..1cb2e6ac 100644
--- a/src/DockWidgetBase.cpp
+++ b/src/DockWidgetBase.cpp
@@ -102,7 +102,7 @@ public:
     QStringList affinities;
     QString title;
     QIcon icon;
-    QWidget *widget = nullptr;
+    QWidgetOrQuick *widget = nullptr;
     DockWidgetBase *const q;
     DockWidgetBase::Options options;
     QAction *const toggleAction;
@@ -210,7 +210,7 @@ void DockWidgetBase::addDockWidgetToContainingWindow(DockWidgetBase *other, Loca
     }
 }
 
-void DockWidgetBase::setWidget(QWidget *w)
+void DockWidgetBase::setWidget(QWidgetOrQuick *w)
 {
     Q_ASSERT(w && !d->widget);
     qCDebug(addwidget) << Q_FUNC_INFO << w;
@@ -221,7 +221,7 @@ void DockWidgetBase::setWidget(QWidget *w)
     setWindowTitle(uniqueName());
 }
 
-QWidget *DockWidgetBase::widget() const
+QWidgetOrQuick *DockWidgetBase::widget() const
 {
     return d->widget;
 }
@@ -717,7 +717,7 @@ DockWidgetBase *DockWidgetBase::deserialize(const LayoutSaver::DockWidget::Ptr &
     }
 
     if (dw) {
-        if (QWidget *w = dw->widget())
+        if (QWidgetOrQuick *w = dw->widget())
             w->setVisible(true);
         dw->setProperty("kddockwidget_was_restored", true);
 
diff --git a/src/DockWidgetBase.h b/src/DockWidgetBase.h
index 4c6b9ffb..aef3818c 100644
--- a/src/DockWidgetBase.h
+++ b/src/DockWidgetBase.h
@@ -25,7 +25,6 @@
 #include "LayoutSaver_p.h"
 
 #include <QVector>
-#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QAction;
@@ -125,12 +124,12 @@ public:
      * @brief sets the widget which this dock widget hosts.
      * @param widget to show inside this dock widget
      */
-    void setWidget(QWidget *widget);
+    void setWidget(QWidgetOrQuick *widget);
 
     /**
      * @brief returns the widget which this dock widget hosts
      */
-    QWidget *widget() const;
+    QWidgetOrQuick *widget() const;
 
     /**
      * @brief Returns whether the dock widget is floating.
@@ -317,7 +316,7 @@ Q_SIGNALS:
     void titleChanged();
 
     ///@brief emitted when the hosted widget changed
-    void widgetChanged(QWidget*);
+    void widgetChanged(QWidgetOrQuick *);
 
     ///@brief emitted when the options change
     ///@sa setOptions(), options()
diff --git a/src/private/DockRegistry.cpp b/src/private/DockRegistry.cpp
index d01c84aa..6df592b5 100644
--- a/src/private/DockRegistry.cpp
+++ b/src/private/DockRegistry.cpp
@@ -238,7 +238,7 @@ MainWindowBase *DockRegistry::mainWindowByName(const QString &name) const
     return nullptr;
 }
 
-DockWidgetBase *DockRegistry::dockWidgetForGuest(QWidget *guest) const
+DockWidgetBase *DockRegistry::dockWidgetForGuest(QWidgetOrQuick *guest) const
 {
     if (!guest)
         return nullptr;
diff --git a/src/private/DockRegistry_p.h b/src/private/DockRegistry_p.h
index 00ffc090..ace45082 100644
--- a/src/private/DockRegistry_p.h
+++ b/src/private/DockRegistry_p.h
@@ -52,7 +52,7 @@ public:
     MainWindowBase *mainWindowByName(const QString &) const;
 
     /// @brief returns the dock widget that hosts @p guest widget. Nullptr if there's none.
-    DockWidgetBase *dockWidgetForGuest(QWidget *guest) const;
+    DockWidgetBase *dockWidgetForGuest(QWidgetOrQuick *guest) const;
 
     bool isSane() const;