qtquick: Remove some dependencies to QApplication

examples/dockwidgets/MyMainWindow.cpp

@@ -24,6 +24,8 @@
 #include <QRandomGenerator>
 #endif
 
+#include <QApplication>
+
 #include <stdlib.h>
 #include <time.h>
 

examples/minimal/main.cpp

@@ -15,6 +15,7 @@
 #include <kddockwidgets/MainWindow.h>
 
 #include <QStyleFactory>
+#include <QApplication>
 
 // clazy:excludeall=qstring-allocations
 

src/Config.cpp

@@ -23,7 +23,6 @@
 #include "FrameworkWidgetFactory.h"
 #include "Utils_p.h"
 
-#include <QApplication>
 #include <QDebug>
 #include <QOperatingSystemVersion>
 

src/FocusScope.cpp

@@ -23,7 +23,7 @@
 #include "DockRegistry_p.h"
 
 #include <QObject>
-#include <QApplication>
+#include <QGuiApplication>
 #include <QPointer>
 
 using namespace KDDockWidgets;

src/LayoutSaver.cpp

@@ -32,7 +32,6 @@
 #include <qmath.h>
 #include <QDebug>
 #include <QSettings>
-#include <QApplication>
 #include <QFile>
 
 #include <memory>

src/LayoutSaver_p.h

@@ -18,7 +18,7 @@
 #include <QRect>
 #include <QDebug>
 #include <QScreen>
-#include <QApplication>
+#include <QGuiApplication>
 #include <QJsonDocument>
 
 #include <memory>

src/MainWindow.cpp

@@ -25,7 +25,6 @@
 #include "DropAreaWithCentralFrame_p.h"
 #include "FrameworkWidgetFactory.h"
 
-#include <QApplication>
 #include <QVBoxLayout>
 #include <QPainter>
 
@@ -99,8 +98,6 @@ MainWindow::MainWindow(const QString &name, MainWindowOptions options,
     }
 
     setCentralWidget(centralWidget);
-
-    // qApp->installEventFilter(this);
 }
 
 MainWindow::~MainWindow()

src/private/DockRegistry.cpp

@@ -21,7 +21,7 @@
 
 #include <QPointer>
 #include <QDebug>
-#include <QApplication>
+#include <QGuiApplication>
 #include <QWindow>
 
 #ifdef KDDOCKWIDGETS_QTWIDGETS

src/private/Draggable.cpp

@@ -13,8 +13,8 @@
 #include "DragController_p.h"
 #include "FloatingWindow_p.h"
 #include "WidgetResizeHandler_p.h"
+#include "Utils_p.h"
 
-#include <QApplication>
 
 using namespace KDDockWidgets;
 
@@ -54,7 +54,7 @@ QWidgetOrQuick *Draggable::asWidget() const
 
 bool Draggable::dragCanStart(QPoint pressPos, QPoint globalPos) const
 {
-     return (globalPos - pressPos).manhattanLength() > QApplication::startDragDistance();
+    return (globalPos - pressPos).manhattanLength() > KDDockWidgets::startDragDistance();
 }
 
 WidgetResizeHandler *Draggable::widgetResizeHandler() const

src/private/Utils_p.h

@@ -14,7 +14,6 @@
 
 #include "Config.h"
 
-#include <QApplication>
 #include <QScreen>
 #include <QWidget>
 #include <QWindow>
@@ -22,6 +21,8 @@
 #ifdef KDDOCKWIDGETS_QTQUICK
 # include <QQuickItem>
 # include <QQuickWindow>
+#else
+# include <QApplication>
 #endif
 
 #ifdef QT_X11EXTRAS_LIB
@@ -122,6 +123,15 @@ inline bool isWindow(const QWindow *w)
     return w != nullptr;
 }
 
+inline int startDragDistance()
+{
+#ifdef KDDOCKWIDGETS_QTWIDGETS
+    return QApplication::startDragDistance();
+#else
+    return 4;
+#endif
+}
+
 #ifdef KDDOCKWIDGETS_QTWIDGETS
 inline int screenNumberForWidget(const QWidget *widget)
 {

src/private/multisplitter/CMakeLists.txt

@@ -61,7 +61,7 @@ qt5_add_resources(MULTISPLITTER_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/kddockwidg
 
 add_library(kddockwidgets_multisplitter ${KDDockWidgets_LIBRARY_MODE} ${MULTISPLITTER_SRCS} ${MULTISPLITTER_RESOURCES})
 add_library(KDAB::kddockwidgets_multisplitter ALIAS kddockwidgets_multisplitter)
-target_link_libraries(kddockwidgets_multisplitter Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Widgets)
+
 set_compiler_flags(kddockwidgets_multisplitter)
 
 if(BUILD_MULTISPLITTER_QTWIDGETS_FRONTEND)
@@ -71,7 +71,8 @@ endif()
 
 if(BUILD_MULTISPLITTER_QTQUICK_FRONTEND)
   find_package(Qt5Quick)
-  target_link_libraries(kddockwidgets_multisplitter Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Quick)
+  find_package(Qt5Widgets) # QtWidgets required for QSizePolicy, for example
+  target_link_libraries(kddockwidgets_multisplitter Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Quick Qt${QT_MAJOR_VERSION}::Widgets)
 endif()
 
 if(${PROJECT_NAME}_STATIC)