qtquick: Fix qmllint warnings about unknown properties

By using the actual type instead of just QtObject

src/CMakeLists.txt

@@ -138,15 +138,13 @@ set(KDDW_FRONTEND_QTQUICK_SRCS
     qtquick/views/DropArea.cpp
     qtquick/views/DockWidget.cpp
     qtquick/views/FloatingWindow.cpp
-    qtquick/views/Group.cpp
     qtquick/views/MainWindow.cpp
     qtquick/views/MainWindowMDI.cpp
     qtquick/views/MDILayout.cpp
     qtquick/views/RubberBand.cpp
     qtquick/views/Separator.cpp
     qtquick/views/Stack.cpp
     qtquick/views/TabBar.cpp
-    qtquick/views/TitleBar.cpp
     qtquick/views/View.cpp
     qtquick/views/ViewWrapper.cpp
     qtquick/views/ClassicIndicatorsWindow.cpp
@@ -541,6 +539,10 @@ if(KDDW_FRONTEND_QTQUICK)
         qtquick/DockWidgetInstantiator.h
         qtquick/MainWindowMDIInstantiator.cpp
         qtquick/MainWindowMDIInstantiator.h
+        qtquick/views/Group.cpp
+        qtquick/views/Group.h
+        qtquick/views/TitleBar.cpp
+        qtquick/views/TitleBar.h
     )
 
     if(NOT KDDockWidgets_QML_MODULE)

src/qtquick/MainWindowInstantiator.h

@@ -16,6 +16,13 @@
 #include "kddockwidgets/docks_export.h"
 #include "kddockwidgets/KDDockWidgets.h"
 
+// workaround QTBUG-101146, the QML_ELEMENTS Inside views/ aren't being included automatically
+#include "views/Group.h"
+#include "views/TitleBar.h"
+#include "views/TabBar.h"
+#include "views/DropArea.h"
+#include "views/FloatingWindow.h"
+
 #include <QQuickItem>
 #include <QQmlEngine>
 

src/qtquick/QmlTypes.cpp

@@ -15,6 +15,12 @@
 #include "MainWindowMDIInstantiator.h"
 #include "LayoutSaverInstantiator.h"
 
+#include "views/Group.h"
+#include "views/TitleBar.h"
+#include "views/TabBar.h"
+#include "views/DropArea.h"
+#include "views/FloatingWindow.h"
+
 #include <QQmlEngine>
 #include <QDebug>
 
@@ -26,4 +32,22 @@ void KDDockWidgets::registerQmlTypes()
     qmlRegisterType<LayoutSaverInstantiator>("com.kdab.dockwidgets", 2, 0, "LayoutSaver");
     qmlRegisterUncreatableMetaObject(KDDockWidgets::staticMetaObject, "com.kdab.dockwidgets", 2, 0,
                                      "KDDockWidgets", QStringLiteral("Enum access only"));
+
+    qmlRegisterUncreatableType<QtQuick::Group>("com.kdab.dockwidgets", 2, 0,
+                                               "GroupView", QStringLiteral("Internal usage only"));
+
+    qmlRegisterUncreatableType<QtQuick::TitleBar>("com.kdab.dockwidgets", 2, 0,
+                                                  "TitleBarView", QStringLiteral("Internal usage only"));
+
+    qmlRegisterUncreatableType<QtQuick::TabBar>("com.kdab.dockwidgets", 2, 0,
+                                                "TabBarView", QStringLiteral("Internal usage only"));
+
+    qmlRegisterUncreatableType<QtQuick::DropArea>("com.kdab.dockwidgets", 2, 0,
+                                                  "DropAreaView", QStringLiteral("Internal usage only"));
+
+    qmlRegisterUncreatableType<QtQuick::FloatingWindow>("com.kdab.dockwidgets", 2, 0,
+                                                        "FloatingWindowView", QStringLiteral("Internal usage only"));
+
+    qmlRegisterUncreatableType<QtQuick::DockWidgetModel>("com.kdab.dockwidgets", 2, 0,
+                                                         "DockWidgetModel", QStringLiteral("Internal usage only"));
 }

src/qtquick/views/DropArea.h

@@ -28,6 +28,8 @@ class DOCKS_EXPORT DropArea : public QtQuick::View
 {
     Q_OBJECT
 public:
+    QML_NAMED_ELEMENT(DropAreaView)
+    QML_UNCREATABLE("Created by the framework only.")
     explicit DropArea(Core::DropArea *, Core::View *parent);
     ~DropArea();
 

src/qtquick/views/FloatingWindow.h

@@ -37,6 +37,9 @@ using QuickWindowCreationCallback = std::function<void(QQuickView *window, QtQui
 class DOCKS_EXPORT FloatingWindow : public QtQuick::View
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(FloatingWindowView)
+    QML_UNCREATABLE("Created by the framework only.")
+
     Q_PROPERTY(QObject *titleBar READ titleBar CONSTANT)
     Q_PROPERTY(QObject *dropArea READ dropArea CONSTANT)
 public:

src/qtquick/views/Group.cpp

@@ -215,7 +215,7 @@ QSize Group::maxSizeHint() const
     return View::maxSizeHint();
 }
 
-QObject *Group::tabBarObj() const
+QtQuick::TabBar *Group::tabBarObj() const
 {
     return tabBarView();
 }

src/qtquick/views/Group.h

@@ -37,7 +37,9 @@ class Stack;
 class DOCKS_EXPORT Group : public QtQuick::View, public Core::GroupViewInterface
 {
     Q_OBJECT
-    Q_PROPERTY(QObject *tabBar READ tabBarObj CONSTANT)
+    QML_NAMED_ELEMENT(GroupView)
+    QML_UNCREATABLE("Created by the framework only.")
+    Q_PROPERTY(KDDockWidgets::QtQuick::TabBar *tabBar READ tabBarObj CONSTANT)
     Q_PROPERTY(KDDockWidgets::QtQuick::TitleBar *titleBar READ titleBar CONSTANT)
     Q_PROPERTY(int userType READ userType CONSTANT)
     Q_PROPERTY(KDDockWidgets::QtQuick::TitleBar *actualTitleBar READ actualTitleBar NOTIFY
@@ -66,7 +68,7 @@ class DOCKS_EXPORT Group : public QtQuick::View, public Core::GroupViewInterface
     KDDockWidgets::QtQuick::TitleBar *titleBar() const;
     KDDockWidgets::QtQuick::TitleBar *actualTitleBar() const;
     int userType() const;
-    QObject *tabBarObj() const;
+    QtQuick::TabBar *tabBarObj() const;
 
     /// Sets the size of this group in the MDI layout
     Q_INVOKABLE void setMDISize(QSize);

src/qtquick/views/TabBar.h

@@ -44,6 +44,8 @@ class DockWidgetModel;
 class DOCKS_EXPORT TabBar : public QtQuick::View, public Core::TabBarViewInterface
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(TabBarView)
+    QML_UNCREATABLE("Created by the framework only.")
     Q_PROPERTY(QQuickItem *tabBarQmlItem READ tabBarQmlItem WRITE setTabBarQmlItem NOTIFY
                    tabBarQmlItemChanged)
     Q_PROPERTY(bool tabBarAutoHide READ tabBarAutoHide NOTIFY tabBarAutoHideChanged)
@@ -114,6 +116,8 @@ class DOCKS_EXPORT TabBar : public QtQuick::View, public Core::TabBarViewInterfa
 class DockWidgetModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(DockWidgetModel)
+    QML_UNCREATABLE("Created by the framework only.")
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 public:
     enum Role {

src/qtquick/views/TitleBar.h

@@ -29,6 +29,9 @@ namespace QtQuick {
 class DOCKS_EXPORT TitleBar : public QtQuick::View, public Core::TitleBarViewInterface
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(TitleBarView)
+    QML_UNCREATABLE("Created by the framework only.")
+
     // These properties is just for the unit-tests
     Q_PROPERTY(QQuickItem *titleBarQmlItem READ titleBarQmlItem WRITE setTitleBarQmlItem NOTIFY
                    titleBarQmlItemChanged)

src/qtquick/views/qml/FloatingWindow.qml

@@ -10,13 +10,15 @@
 */
 
 import QtQuick 2.9
+
+import com.kdab.dockwidgets 2.0
 import "." as KDDW
 
 Rectangle {
     id: root
-    readonly property QtObject floatingWindowCpp: parent
-    readonly property QtObject titleBarCpp: floatingWindowCpp ? floatingWindowCpp.titleBar : null
-    readonly property QtObject dropAreaCpp: floatingWindowCpp ? floatingWindowCpp.dropArea : null
+    readonly property FloatingWindowView floatingWindowCpp: parent
+    readonly property TitleBarView titleBarCpp: floatingWindowCpp ? floatingWindowCpp.titleBar : null
+    readonly property DropAreaView dropAreaCpp: floatingWindowCpp ? floatingWindowCpp.dropArea : null
     readonly property int titleBarHeight: titleBar.heightWhenVisible
     property int margins: 4
 
@@ -35,12 +37,12 @@ Rectangle {
 
     Loader {
         id: titleBar
-        readonly property QtObject titleBarCpp: root.titleBarCpp
+        readonly property TitleBarView titleBarCpp: root.titleBarCpp
         readonly property int heightWhenVisible: item.heightWhenVisible
         source: _kddw_widgetFactory.titleBarFilename()
 
         anchors {
-            top:  parent ? parent.top : undefined
+            top: parent ? parent.top : undefined
             left: parent ? parent.left : undefined
             right: parent ? parent.right : undefined
             margins: root.margins
@@ -61,9 +63,9 @@ Rectangle {
             bottomMargin: root.margins
         }
 
-        onHeightChanged: {
-            // console.log("FloatingWindow.qml.dropArea height changed to " + height + " ; root.height= " + root.height)
-        }
+        onHeightChanged:
+        // console.log("FloatingWindow.qml.dropArea height changed to " + height + " ; root.height= " + root.height)
+        {}
     }
 
     onDropAreaCppChanged: {
@@ -76,11 +78,11 @@ Rectangle {
         }
     }
 
-    onHeightChanged: {
-        // console.log("FloatingWindow.qml.root height changed to " + height)
-    }
+    onHeightChanged:
+    // console.log("FloatingWindow.qml.root height changed to " + height)
+    {}
 
-    onWidthChanged: {
-        // console.log("FloatingWindow.qml.root width changed to " + width)
-    }
+    onWidthChanged:
+    // console.log("FloatingWindow.qml.root width changed to " + width)
+    {}
 }

src/qtquick/views/qml/Group.qml

@@ -15,7 +15,7 @@ import com.kdab.dockwidgets 2.0
 Rectangle {
     id: root
 
-    property QtObject groupCpp
+    property GroupView groupCpp
     readonly property QtObject titleBarCpp: groupCpp ? groupCpp.titleBar : null
     readonly property int nonContentsHeight: (titleBar.item ? titleBar.item.heightWhenVisible : 0) + tabbar.implicitHeight + (2 * contentsMargin) + titleBarContentsMargin
     property int contentsMargin: isMDI ? 2 : 1

src/qtquick/views/qml/MDIResizeHandlerHelper.qml

@@ -16,7 +16,7 @@ MouseArea {
     id: root
     required property int resizeMargin
     required property bool resizeAllowed
-    required property QtObject groupCpp
+    required property GroupView groupCpp
     required property int cursorPosition
 
     enabled: resizeAllowed

src/qtquick/views/qml/TabBarBase.qml

@@ -11,16 +11,18 @@
 
 import QtQuick 2.9
 
+import com.kdab.dockwidgets 2.0
+
 Item {
     id: root
 
     readonly property bool hasCustomMouseEventRedirector: parent.hasCustomMouseEventRedirector
 
     /// This is our C++ Group.cpp view
-    readonly property QtObject groupCpp: parent.groupCpp
+    readonly property GroupView groupCpp: parent.groupCpp
 
     /// This is our C++ TabBar.cpp view
-    readonly property QtObject tabBarCpp: groupCpp ? groupCpp.tabBar : null
+    readonly property TabBarView tabBarCpp: groupCpp ? groupCpp.tabBar : null
 
     /// The number of tabs
     readonly property int count: tabBarCpp ? tabBarCpp.dockWidgetModel.count : 0

src/qtquick/views/qml/TitleBarBase.qml

@@ -10,6 +10,7 @@
 */
 
 import QtQuick 2.9
+import com.kdab.dockwidgets 2.0
 
 /**
  * @brief Base component for title bars.
@@ -24,7 +25,7 @@ import QtQuick 2.9
 Rectangle {
     id: root
 
-    readonly property QtObject titleBarCpp: parent.titleBarCpp // It's set in the loader
+    readonly property TitleBarView titleBarCpp: parent.titleBarCpp // It's set in the loader
     readonly property string title: titleBarCpp ? titleBarCpp.title : ""
     readonly property bool floatButtonVisible: titleBarCpp && titleBarCpp.floatButtonVisible
     readonly property bool maximizeButtonVisible: titleBarCpp && titleBarCpp.maximizeButtonVisible
@@ -44,16 +45,16 @@ Rectangle {
     property bool hasCustomMouseEventRedirector: false
 
     /// @brief Signal emitted by a TitleBar.qml component when the close button is clicked
-    signal closeButtonClicked();
+    signal closeButtonClicked
 
     /// @brief Signal emitted by a TitleBar.qml component when the float button is clicked
-    signal floatButtonClicked();
+    signal floatButtonClicked
 
     /// @brief Signal emitted by a TitleBar.qml component when the maximize button is clicked
-    signal maximizeButtonClicked();
+    signal maximizeButtonClicked
 
     /// @brief Signal emitted by a TitleBar.qml component when the minimize button is clicked
-    signal minimizeButtonClicked();
+    signal minimizeButtonClicked
 
     visible: titleBarCpp && titleBarCpp.visible
     height: visible ? heightWhenVisible : 0
@@ -72,7 +73,7 @@ Rectangle {
     onTitleBarCppChanged: {
         if (titleBarCpp) {
             if (!root.hasCustomMouseEventRedirector)
-                titleBarCpp.redirectMouseEvents(titleBarDragMouseArea)
+                titleBarCpp.redirectMouseEvents(titleBarDragMouseArea);
 
             // Setting just so the unit-tests can access the buttons
             titleBarCpp.titleBarQmlItem = this;