diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 129c5268..0b2b8292 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,6 +28,7 @@ set(DOCKSLIBS_SRCS DockWidgetBase.cpp MainWindowBase.cpp LayoutSaver.cpp + private/MultiSplitter.cpp private/Position.cpp private/ObjectViewer.cpp private/DropIndicatorOverlayInterface.cpp @@ -97,7 +98,6 @@ else() private/widgets/TitleBarWidget.cpp private/widgets/DockWidget.cpp private/widgets/QWidgetAdapter_widgets.cpp - private/widgets/MultiSplitter.cpp private/indicators/ClassicIndicators.cpp # private/indicators/AnimatedIndicators.cpp ) diff --git a/src/private/DockRegistry.cpp b/src/private/DockRegistry.cpp index 77fc8d35..d01c84aa 100644 --- a/src/private/DockRegistry.cpp +++ b/src/private/DockRegistry.cpp @@ -13,8 +13,7 @@ #include "DockWidgetBase.h" #include "Logging_p.h" #include "Position_p.h" -#include "widgets/MultiSplitter_p.h" -#include "quick/QmlTypes.h" +#include "MultiSplitter_p.h" #include #include @@ -23,6 +22,8 @@ #ifdef KDDOCKWIDGETS_QTWIDGETS # include "DebugWindow_p.h" +#else +# include "quick/QmlTypes.h" #endif using namespace KDDockWidgets; diff --git a/src/private/DropArea_p.h b/src/private/DropArea_p.h index 8ab1d88a..9262ecde 100644 --- a/src/private/DropArea_p.h +++ b/src/private/DropArea_p.h @@ -22,7 +22,7 @@ #include "docks_export.h" #include "Frame_p.h" #include "KDDockWidgets.h" -#include "widgets/MultiSplitter_p.h" +#include "MultiSplitter_p.h" #include "DropIndicatorOverlayInterface_p.h" namespace KDDockWidgets { diff --git a/src/private/widgets/MultiSplitter.cpp b/src/private/MultiSplitter.cpp similarity index 100% rename from src/private/widgets/MultiSplitter.cpp rename to src/private/MultiSplitter.cpp diff --git a/src/private/widgets/MultiSplitter_p.h b/src/private/MultiSplitter_p.h similarity index 100% rename from src/private/widgets/MultiSplitter_p.h rename to src/private/MultiSplitter_p.h diff --git a/src/private/Position.cpp b/src/private/Position.cpp index 1f608b3b..b42dbc4d 100644 --- a/src/private/Position.cpp +++ b/src/private/Position.cpp @@ -17,7 +17,7 @@ #include "Position_p.h" #include "DockRegistry_p.h" -#include "widgets/MultiSplitter_p.h" +#include "MultiSplitter_p.h" #include diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp index af60bdbb..e2881d51 100644 --- a/tests/tst_docks.cpp +++ b/tests/tst_docks.cpp @@ -25,7 +25,7 @@ #include "LayoutSaver.h" #include "LayoutSaver_p.h" #include "TabWidget_p.h" -#include "widgets/MultiSplitter_p.h" +#include "MultiSplitter_p.h" #include "Position_p.h" #include "utils.h" #include "FrameworkWidgetFactory.h"