From c83e95e66a47fa798916a110e98d16ab3bc3bf5b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 8 Aug 2019 12:42:02 -0400
Subject: [PATCH] [libcalamaresui] Chase 3rdparty move

 - Widgets need to #include from different path
---
 src/libcalamaresui/CMakeLists.txt            | 2 +-
 src/libcalamaresui/utils/DebugWindow.cpp     | 5 +++--
 src/libcalamaresui/widgets/WaitingWidget.cpp | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index f5389069d..04565206e 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -2,7 +2,7 @@
 # view modules, view steps, widgets, and branding.
 
 # The UI libs use the non-UI library
-include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamares ${CMAKE_BINARY_DIR}/src/libcalamares )
+include_directories( ${CMAKE_SOURCE_DIR}/src/libcalamares ${CMAKE_BINARY_DIR}/src/libcalamares ${CMAKE_SOURCE_DIR} )
 
 set( calamaresui_SOURCES
     modulesystem/CppJobModule.cpp
diff --git a/src/libcalamaresui/utils/DebugWindow.cpp b/src/libcalamaresui/utils/DebugWindow.cpp
index ed016dd97..094511be4 100644
--- a/src/libcalamaresui/utils/DebugWindow.cpp
+++ b/src/libcalamaresui/utils/DebugWindow.cpp
@@ -23,7 +23,6 @@
 #include "Branding.h"
 #include "modulesystem/Module.h"
 #include "modulesystem/ModuleManager.h"
-#include "utils/qjsonmodel.h"
 
 #include "GlobalStorage.h"
 #include "Job.h"
@@ -31,11 +30,13 @@
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 
+#include "3rdparty/qjsonmodel.h"
 
 #ifdef WITH_PYTHONQT
-#include <gui/PythonQtScriptingConsole.h>
 #include "ViewManager.h"
 #include "viewpages/PythonQtViewStep.h"
+
+#include <gui/PythonQtScriptingConsole.h>
 #endif
 
 #include <QJsonDocument>
diff --git a/src/libcalamaresui/widgets/WaitingWidget.cpp b/src/libcalamaresui/widgets/WaitingWidget.cpp
index 286c611ab..1a658b35b 100644
--- a/src/libcalamaresui/widgets/WaitingWidget.cpp
+++ b/src/libcalamaresui/widgets/WaitingWidget.cpp
@@ -20,7 +20,8 @@
 #include "WaitingWidget.h"
 
 #include "utils/CalamaresUtilsGui.h"
-#include "waitingspinnerwidget.h"
+
+#include "3rdparty/waitingspinnerwidget.h"
 
 #include <QBoxLayout>
 #include <QLabel>