Commit dbf9834b authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Make systemsettingsview shared again

2b61b00d made it static but that causes
symbols to be loaded into the app twice, which is brittle.

Partially reverts 2b61b00d.

BUG: 434045
parent 1ec8b707
......@@ -13,6 +13,7 @@ include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDEClangFormat)
include(GenerateExportHeader)
include(ECMQMLModules)
include(ECMQtDeclareLoggingCategory)
if(ECM_VERSION VERSION_GREATER_EQUAL 5.79)
......
......@@ -22,6 +22,8 @@
#include <QObject>
#include "systemsettingsview_export.h"
class QString;
class MenuItem;
class KConfigGroup;
......@@ -34,7 +36,7 @@ class KConfigGroup;
*
* @author Ben Cooksley <bcooksley@kde.org>
*/
class BaseData : public QObject
class SYSTEMSETTINGSVIEW_EXPORT BaseData : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(BaseData)
......
......@@ -24,6 +24,8 @@
#include <KPluginMetaData>
#include "systemsettingsview_export.h"
class QAction;
class MenuItem;
class ModuleView;
......@@ -45,7 +47,7 @@ template<typename T> class QList;
* @author Ben Cooksley <bcooksley@kde.org>
* @author Mathias Soeken <msoeken@informatik.uni-bremen.de>
*/
class Q_DECL_EXPORT BaseMode : public QObject
class SYSTEMSETTINGSVIEW_EXPORT BaseMode : public QObject
{
Q_OBJECT
......
......@@ -10,7 +10,8 @@ set(systemsettingsview_LIB_SRCS
ki18n_wrap_ui( systemsettingsview_LIB_SRCS externalModule.ui )
add_library( systemsettingsview STATIC ${systemsettingsview_LIB_SRCS} )
add_library( systemsettingsview ${systemsettingsview_LIB_SRCS} )
generate_export_header(systemsettingsview)
target_link_libraries( systemsettingsview
KF5::ItemViews
......@@ -22,4 +23,7 @@ target_link_libraries( systemsettingsview
KF5::Activities
)
set_target_properties( systemsettingsview PROPERTIES SOVERSION 3 )
install( TARGETS systemsettingsview ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES systemsettingsview.desktop systemsettingsexternalapp.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} )
......@@ -24,6 +24,8 @@
#include <KService>
#include "systemsettingsview_export.h"
class QString;
class KCModuleInfo;
template<typename T> class QList;
......@@ -45,7 +47,7 @@ template<typename T> class QList;
* @author Ben Cooksley <bcooksley@kde.org>
* @author Will Stephenson <wstephenson@kde.org>
*/
class MenuItem
class SYSTEMSETTINGSVIEW_EXPORT MenuItem
{
public:
/**
......
......@@ -23,6 +23,8 @@
#include <QAbstractItemModel>
#include "systemsettingsview_export.h"
class MenuItem;
/**
......@@ -35,7 +37,7 @@ class MenuItem;
* @author Ben Cooksley <bcooksley@kde.org>
* @author Will Stephenson <wstephenson@kde.org>
*/
class MenuModel : public QAbstractItemModel
class SYSTEMSETTINGSVIEW_EXPORT MenuModel : public QAbstractItemModel
{
Q_OBJECT
......
......@@ -23,6 +23,8 @@
#include <KCategorizedSortFilterProxyModel>
#include "systemsettingsview_export.h"
/**
* @brief Provides a filter model for MenuModel
*
......@@ -35,7 +37,7 @@
* @author Will Stephenson <wstephenson@kde.org>
* @author Ben Cooksley <bcooksley@kde.org>
*/
class MenuProxyModel : public KCategorizedSortFilterProxyModel
class SYSTEMSETTINGSVIEW_EXPORT MenuProxyModel : public KCategorizedSortFilterProxyModel
{
Q_OBJECT
......
......@@ -25,6 +25,8 @@
#include <QModelIndex>
#include <QWidget>
#include "systemsettingsview_export.h"
class KAboutData;
class KCModuleInfo;
class KCModuleProxy;
......@@ -46,7 +48,7 @@ class KPageWidgetItem;
* @author Mathias Soeken <msoeken@informatik.uni-bremen.de>
* @author Ben Cooksley <bcooksley@kde.org>
*/
class ModuleView : public QWidget
class SYSTEMSETTINGSVIEW_EXPORT ModuleView : public QWidget
{
Q_OBJECT
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment