From 037fa76ffff61df6ed2d08fe793b4fc3de630fd5 Mon Sep 17 00:00:00 2001
From: Sergio Martins <sergio.martins@kdab.com>
Date: Fri, 14 Aug 2020 17:49:24 +0100
Subject: [PATCH] Fix building user apps out of repo

Our example was being built as part of KDDW, so that worked fine.
Now it can also be built with an installed KDDW.

Problem was the folder hiearchy in the installed include dir
didn't match the folder hiearchy in the source repo

Fixes #62
---
 examples/dockwidgets/MyFrameworkWidgetFactory.cpp    |  4 +++-
 src/CMakeLists.txt                                   | 12 ++++++------
 src/QWidgetAdapter.h                                 |  4 ++--
 .../{ => private}/multisplitter/Separator_qwidget.h  |  2 +-
 .../{ => private}/multisplitter/Widget_qwidget.h     |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)
 rename src/fwd_headers/kddockwidgets/{ => private}/multisplitter/Separator_qwidget.h (83%)
 rename src/fwd_headers/kddockwidgets/{ => private}/multisplitter/Widget_qwidget.h (83%)

diff --git a/examples/dockwidgets/MyFrameworkWidgetFactory.cpp b/examples/dockwidgets/MyFrameworkWidgetFactory.cpp
index 84ba5099..ca5730dc 100644
--- a/examples/dockwidgets/MyFrameworkWidgetFactory.cpp
+++ b/examples/dockwidgets/MyFrameworkWidgetFactory.cpp
@@ -10,9 +10,11 @@
 */
 
 #include "MyFrameworkWidgetFactory.h"
+
 #include <kddockwidgets/FrameworkWidgetFactory.h>
 #include <kddockwidgets/private/widgets/TitleBarWidget_p.h>
-#include <kddockwidgets/multisplitter/Separator_qwidget.h>
+#include <kddockwidgets/private/multisplitter/Separator_qwidget.h>
+
 #include <QApplication>
 
 class MyTitleBar : public KDDockWidgets::TitleBarWidget
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 89da1946..05f7bfa8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -194,12 +194,12 @@ if(MSVC AND NOT ${PROJECT_NAME}_STATIC)
 endif()
 install(FILES ${DOCKS_INSTALLABLE_INCLUDES} DESTINATION include/kddockwidgets)
 install(FILES ${DOCKS_INSTALLABLE_PRIVATE_INCLUDES} DESTINATION include/kddockwidgets/private)
-install(FILES private/multisplitter/Item_p.h DESTINATION include/kddockwidgets/multisplitter)
-install(FILES private/multisplitter/Widget.h DESTINATION include/kddockwidgets/multisplitter)
-install(FILES private/multisplitter/Widget_qwidget.h DESTINATION include/kddockwidgets/multisplitter)
-install(FILES private/multisplitter/Separator_p.h DESTINATION include/kddockwidgets/multisplitter)
-install(FILES private/multisplitter/Separator_qwidget.h DESTINATION include/kddockwidgets/multisplitter)
-install(FILES private/multisplitter/multisplitter_export.h DESTINATION include/kddockwidgets/multisplitter)
+install(FILES private/multisplitter/Item_p.h DESTINATION include/kddockwidgets/private/multisplitter)
+install(FILES private/multisplitter/Widget.h DESTINATION include/kddockwidgets/private/multisplitter)
+install(FILES private/multisplitter/Widget_qwidget.h DESTINATION include/kddockwidgets/private/multisplitter)
+install(FILES private/multisplitter/Separator_p.h DESTINATION include/kddockwidgets/private/multisplitter)
+install(FILES private/multisplitter/Separator_qwidget.h DESTINATION include/kddockwidgets/private/multisplitter)
+install(FILES private/multisplitter/multisplitter_export.h DESTINATION include/kddockwidgets/private/multisplitter)
 install(FILES ${DOCKS_INSTALLABLE_PRIVATE_WIDGET_INCLUDES} DESTINATION include/kddockwidgets/private/widgets)
 
 include(CMakePackageConfigHelpers)
diff --git a/src/QWidgetAdapter.h b/src/QWidgetAdapter.h
index b103def5..bbf5ea4a 100644
--- a/src/QWidgetAdapter.h
+++ b/src/QWidgetAdapter.h
@@ -41,7 +41,7 @@ inline bool isMinimized(QWindow *window)
 }}
 
 #ifdef KDDOCKWIDGETS_QTWIDGETS
-# include "../multisplitter/Widget_qwidget.h"
+# include "private/multisplitter/Widget_qwidget.h"
 # include "private/widgets/QWidgetAdapter_widgets_p.h"
 # include <QMainWindow>
   namespace KDDockWidgets {
@@ -55,7 +55,7 @@ inline bool isMinimized(QWindow *window)
     typedef QWidget WidgetType;
   }
 #else
-# include "../multisplitter/Widget_quick.h"
+# include "private/multisplitter/Widget_quick.h"
 # include "private/quick/QWidgetAdapter_quick_p.h"
   namespace KDDockWidgets {
     class MainWindowQuick;
diff --git a/src/fwd_headers/kddockwidgets/multisplitter/Separator_qwidget.h b/src/fwd_headers/kddockwidgets/private/multisplitter/Separator_qwidget.h
similarity index 83%
rename from src/fwd_headers/kddockwidgets/multisplitter/Separator_qwidget.h
rename to src/fwd_headers/kddockwidgets/private/multisplitter/Separator_qwidget.h
index 0d1f824b..83fdb86c 100644
--- a/src/fwd_headers/kddockwidgets/multisplitter/Separator_qwidget.h
+++ b/src/fwd_headers/kddockwidgets/private/multisplitter/Separator_qwidget.h
@@ -9,4 +9,4 @@
   Contact KDAB at <info@kdab.com> for commercial licensing options.
 */
 
-#include "../../../private/multisplitter/Separator_qwidget.h"
+#include "../../../../private/multisplitter/Separator_qwidget.h"
diff --git a/src/fwd_headers/kddockwidgets/multisplitter/Widget_qwidget.h b/src/fwd_headers/kddockwidgets/private/multisplitter/Widget_qwidget.h
similarity index 83%
rename from src/fwd_headers/kddockwidgets/multisplitter/Widget_qwidget.h
rename to src/fwd_headers/kddockwidgets/private/multisplitter/Widget_qwidget.h
index 8bf87a2e..2b7988f4 100644
--- a/src/fwd_headers/kddockwidgets/multisplitter/Widget_qwidget.h
+++ b/src/fwd_headers/kddockwidgets/private/multisplitter/Widget_qwidget.h
@@ -9,4 +9,4 @@
   Contact KDAB at <info@kdab.com> for commercial licensing options.
 */
 
-#include "../../../private/multisplitter/Widget_qwidget.h"
+#include "../../../../private/multisplitter/Widget_qwidget.h"