enabled the new dock system by default

CMakeLists.txt

@@ -96,8 +96,6 @@ set(JACK_LONGNAME "JACK (Jack Audio Connection Kit)")
 set(JACK_MIN_VERSION "0.98.0")
 option(BUILD_JACK    "Build with support for ${JACK_LONGNAME} audio backend. JACK >= ${JACK_MIN_VERSION} will be needed." OFF)
 
-option(KDAB_DOCKWIDGETS "Build KDAB dockwidgets" OFF)
-
 if (BUILD_PORTABLEAPPS)
     set(WIN_PORTABLE 1)
 endif (BUILD_PORTABLEAPPS)
@@ -225,15 +223,16 @@ add_subdirectory(src/framework/global) # should be first to work pch
 add_subdirectory(thirdparty/qzip)
 add_subdirectory(src)
 
-if (KDAB_DOCKWIDGETS)
-    if (NOT BUILD_SHARED_LIBS)
-        set(KDDockWidgets_STATIC ON CACHE BOOL "Build static versions of the libraries" FORCE)
-    endif(NOT BUILD_SHARED_LIBS)
+###########################################
+# Setup the KDDockWidgets lib
+###########################################
+if (NOT BUILD_SHARED_LIBS)
+    set(KDDockWidgets_STATIC ON CACHE BOOL "Build static versions of the libraries" FORCE)
+endif(NOT BUILD_SHARED_LIBS)
 
-    set(KDDockWidgets_QTQUICK ON CACHE BOOL "Build for QtQuick instead of QtWidgets" FORCE)
-    set(KDDockWidgets_EXAMPLES OFF CACHE BOOL "Build the examples" FORCE)
-    add_subdirectory(thirdparty/KDDockWidgets)
-endif(KDAB_DOCKWIDGETS)
+set(KDDockWidgets_QTQUICK ON CACHE BOOL "Build for QtQuick instead of QtWidgets" FORCE)
+set(KDDockWidgets_EXAMPLES OFF CACHE BOOL "Build the examples" FORCE)
+add_subdirectory(thirdparty/KDDockWidgets)
 
 ###########################################
 # Setup Packaging

build/config.h.in

@@ -73,8 +73,6 @@
 
 #cmakedefine APP_UPDATABLE
 
-#cmakedefine KDAB_DOCKWIDGETS
-
 #define USE_BSP     true
 
 // does not work on windows/mac:

src/appshell/CMakeLists.txt

@@ -23,11 +23,7 @@ set(MODULE appshell)
 set(MODULE_QRC appshell.qrc)
 set(MODULE_QML_IMPORT ${CMAKE_CURRENT_LIST_DIR}/qml)
 
-if (KDAB_DOCKWIDGETS)
-    include(${CMAKE_CURRENT_LIST_DIR}/view/dockwindow_kdab/dockwindow.cmake)
-else()
-    include(${CMAKE_CURRENT_LIST_DIR}/view/dockwindow/dockwindow.cmake)
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/view/dockwindow_kdab/dockwindow.cmake)
 
 set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/appshellmodule.cpp

src/appshell/appshell.cpp

@@ -30,11 +30,7 @@
 #ifndef Q_OS_WASM
 #include <QThreadPool>
 #endif
-#ifdef KDAB_DOCKWIDGETS
 #include "view/dockwindow_kdab/docksetup.h"
-#else
-#include "view/dockwindow/docksetup.h"
-#endif
 
 #include "log.h"
 #include "modularity/ioc.h"
@@ -150,16 +146,15 @@ int AppShell::run(int argc, char** argv)
         QQmlApplicationEngine* engine = new QQmlApplicationEngine();
 
         dock::DockSetup::setup(engine);
-#if defined(KDAB_DOCKWIDGETS) && defined(Q_OS_WIN)
+
+#if defined(Q_OS_WIN)
         const QString mainQmlFile = "/kdab/platform/win/Main.qml";
-#elif defined(KDAB_DOCKWIDGETS) && defined(Q_OS_MACOS)
+#elif defined(Q_OS_MACOS)
         const QString mainQmlFile = "/kdab/platform/mac/Main.qml";
-#elif defined(KDAB_DOCKWIDGETS) && defined(Q_OS_LINUX)
+#elif defined(Q_OS_LINUX)
         const QString mainQmlFile = "/kdab/platform/linux/Main.qml";
-#elif Q_OS_WASM
+#elif defined(Q_OS_WASM)
         const QString mainQmlFile = "/Main.wasm.qml";
-#else
-        const QString mainQmlFile = "/Main.qml";
 #endif
         //! NOTE Move ownership to UiEngine
         ui::UiEngine::instance()->moveQQmlEngine(engine);

src/appshell/appshellmodule.cpp

@@ -54,11 +54,7 @@
 #include "view/preferences/commonaudioapiconfigurationmodel.h"
 #include "view/framelesswindow/framelesswindowmodel.h"
 
-#ifdef KDAB_DOCKWIDGETS
 #include "view/dockwindow_kdab/docksetup.h"
-#else
-#include "view/dockwindow/docksetup.h"
-#endif
 
 using namespace mu::appshell;
 using namespace mu::framework;