From 761205ecf7b87b6b96210b66a890108b4a83e9dc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 May 2019 07:02:55 -0400 Subject: [PATCH] [libcalamares] Tidy some bits - Explain what the library is for (briefly) in the CMakeLists - Settings should use the right export macro --- src/libcalamares/CMakeLists.txt | 3 +++ src/libcalamares/Settings.cpp | 1 - src/libcalamares/Settings.h | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 4aa7c44df..c4b9fa40c 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -1,3 +1,6 @@ +# libcalamares is the non-GUI part of Calamares, which includes handling +# translations, configurations, logging, utilities, global storage, and (non-GUI) jobs. + add_definitions( ${QT_DEFINITIONS} -DQT_SHARED diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index 0b12d87fb..0089b2ef2 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -21,7 +21,6 @@ #include "Settings.h" -// #include "utils/CalamaresUtils.h" #include "utils/Dirs.h" #include "utils/Logger.h" #include "utils/Yaml.h" diff --git a/src/libcalamares/Settings.h b/src/libcalamares/Settings.h index da3f46921..79ed37ef8 100644 --- a/src/libcalamares/Settings.h +++ b/src/libcalamares/Settings.h @@ -22,7 +22,7 @@ #ifndef SETTINGS_H #define SETTINGS_H -#include "UiDllMacro.h" +#include "DllMacro.h" #include "Typedefs.h" #include @@ -32,7 +32,7 @@ namespace Calamares { -class UIDLLEXPORT Settings : public QObject +class DLLEXPORT Settings : public QObject { Q_OBJECT public: