From aba212d70096a83480bf06c3d9b6146e77abc708 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 20 Jul 2021 14:57:09 +0200
Subject: [PATCH] [summary*] Move Config to the non-QML module, so it can be
 shared

---
 src/modules/summary/CMakeLists.txt           | 3 ++-
 src/modules/{summaryq => summary}/Config.cpp | 3 +--
 src/modules/{summaryq => summary}/Config.h   | 0
 src/modules/summaryq/CMakeLists.txt          | 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename src/modules/{summaryq => summary}/Config.cpp (97%)
 rename src/modules/{summaryq => summary}/Config.h (100%)

diff --git a/src/modules/summary/CMakeLists.txt b/src/modules/summary/CMakeLists.txt
index 57dc731cb..746b22493 100644
--- a/src/modules/summary/CMakeLists.txt
+++ b/src/modules/summary/CMakeLists.txt
@@ -8,8 +8,9 @@ calamares_add_plugin( summary
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
-        SummaryViewStep.cpp
+        Config.cpp
         SummaryPage.cpp
+        SummaryViewStep.cpp
     UI
     LINK_PRIVATE_LIBRARIES
         calamaresui
diff --git a/src/modules/summaryq/Config.cpp b/src/modules/summary/Config.cpp
similarity index 97%
rename from src/modules/summaryq/Config.cpp
rename to src/modules/summary/Config.cpp
index 0f98891a6..bbbb103c3 100644
--- a/src/modules/summaryq/Config.cpp
+++ b/src/modules/summary/Config.cpp
@@ -9,7 +9,6 @@
  */
 
 #include "Config.h"
-#include "SummaryQmlViewStep.h"
 
 #include "Branding.h"
 #include "Settings.h"
@@ -70,7 +69,7 @@ SummaryModel::setSummaryList( const Calamares::ViewStepList& steps, bool withWid
 
 Config::Config( Calamares::ViewStep* parent )
     : QObject( parent )
-    , m_thisViewStep( static_cast< SummaryQmlViewStep* >( parent ) )
+    , m_thisViewStep( parent )
     , m_summary( new SummaryModel( this ) )
 
 {
diff --git a/src/modules/summaryq/Config.h b/src/modules/summary/Config.h
similarity index 100%
rename from src/modules/summaryq/Config.h
rename to src/modules/summary/Config.h
diff --git a/src/modules/summaryq/CMakeLists.txt b/src/modules/summaryq/CMakeLists.txt
index 0df854140..cdf520b24 100644
--- a/src/modules/summaryq/CMakeLists.txt
+++ b/src/modules/summaryq/CMakeLists.txt
@@ -4,15 +4,14 @@ if( NOT WITH_QML )
 endif()
 
 set( _summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary )
-include_directories( ${_finished} )
+include_directories( ${_summary} )
 
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
 calamares_add_plugin( summaryq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         SummaryQmlViewStep.cpp
-        Config.cpp
+        ${_summary}/Config.cpp
     UI
     RESOURCES
         summaryq.qrc