napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adriaan de Groot 2021-07-20 14:57:09 +02:00
parent f8c3b76367
commit aba212d700
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/summary/CMakeLists.txt
View File

@ -8,8 +8,9 @@ calamares_add_plugin( summary
TYPE viewmodule TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES SOURCES
SummaryViewStep.cpp Config.cpp
SummaryPage.cpp SummaryPage.cpp
SummaryViewStep.cpp
UI UI
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui

3
src/modules/summaryq/Config.cpp → src/modules/summary/Config.cpp
View File

@ -9,7 +9,6 @@
*/ */
#include "Config.h" #include "Config.h"
#include "SummaryQmlViewStep.h"
#include "Branding.h" #include "Branding.h"
#include "Settings.h" #include "Settings.h"
@ -70,7 +69,7 @@ SummaryModel::setSummaryList( const Calamares::ViewStepList& steps, bool withWid
Config::Config( Calamares::ViewStep* parent ) Config::Config( Calamares::ViewStep* parent )
: QObject( parent ) : QObject( parent )
, m_thisViewStep( static_cast< SummaryQmlViewStep* >( parent ) ) , m_thisViewStep( parent )
, m_summary( new SummaryModel( this ) ) , m_summary( new SummaryModel( this ) )
{ {

0
src/modules/summaryq/Config.h → src/modules/summary/Config.h
View File

5
src/modules/summaryq/CMakeLists.txt
View File

@ -4,15 +4,14 @@ if( NOT WITH_QML )
endif() endif()
set( _summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary ) set( _summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary )
include_directories( ${_finished} ) include_directories( ${_summary} )
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
calamares_add_plugin( summaryq calamares_add_plugin( summaryq
TYPE viewmodule TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES SOURCES
SummaryQmlViewStep.cpp SummaryQmlViewStep.cpp
Config.cpp ${_summary}/Config.cpp
UI UI
RESOURCES RESOURCES
summaryq.qrc summaryq.qrc