[summary*] Move Config to the non-QML module, so it can be shared

main
Adriaan de Groot 3 years ago
parent f8c3b76367
commit aba212d700

@ -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

@ -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 ) )
{

@ -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

Loading…
Cancel
Save