Merge branch '1.2'

Should fix #152
2021-01-27 23:38:51 +00:00
parent 8a9d9f9fce 9a38626af5
commit 2193c131a8
6 changed files with 8 additions and 6 deletions
--- a/src/private/DragController_p.h
+++ b/src/private/DragController_p.h
@@ -12,7 +12,7 @@
 #ifndef KD_DRAGCONTROLLER_P_H
 #define KD_DRAGCONTROLLER_P_H

-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"

 #include "TitleBar_p.h"
 #include "WindowBeingDragged_p.h"
--- a/src/private/FloatingWindow_p.h
+++ b/src/private/FloatingWindow_p.h
@@ -15,10 +15,10 @@
 #include "kddockwidgets/docks_export.h"
 #include "kddockwidgets/QWidgetAdapter.h"
 #include "kddockwidgets/LayoutSaver.h"
+#include "kddockwidgets/Qt5Qt6Compat_p.h"
 #include "Frame_p.h"
 #include "Draggable_p.h"
 #include "DropArea_p.h"
-#include "kddockwidgets/Qt5Qt6Compat_p.h"

 QT_BEGIN_NAMESPACE
 class QAbstractNativeEventFilter;
--- a/src/private/Position_p.h
+++ b/src/private/Position_p.h
@@ -18,7 +18,8 @@
 #ifndef KDDOCKWIDGETS_POSITION_P_H
 #define KDDOCKWIDGETS_POSITION_P_H

-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
+
 #include "Logging_p.h"
 #include "LayoutSaver.h"
 #include "QWidgetAdapter.h"
--- a/src/private/SideBar_p.h
+++ b/src/private/SideBar_p.h
@@ -12,7 +12,8 @@
 #ifndef KD_SIDEBAR_P_H
 #define KD_SIDEBAR_P_H

-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
+
 #include "KDDockWidgets.h"
 #include "QWidgetAdapter.h"

--- a/src/private/WindowBeingDragged_p.h
+++ b/src/private/WindowBeingDragged_p.h
@@ -12,7 +12,7 @@
 #ifndef KD_WINDOWBEINGDRAGGED_P_H
 #define KD_WINDOWBEINGDRAGGED_P_H

-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
 #include "FloatingWindow_p.h"

 #include <QPointer>
--- a/src/private/quick/MainWindowWrapper_p.h
+++ b/src/private/quick/MainWindowWrapper_p.h
@@ -12,7 +12,7 @@
 #ifndef KD_MAIN_WINDOW_WRAPPER_P_H
 #define KD_MAIN_WINDOW_WRAPPER_P_H

-#include "docks_export.h"
+#include "kddockwidgets/docks_export.h"
 #include "QWidgetAdapter.h"

 #include <QQuickItem>