From fdc376a735e4e7da9a21aa053f65dff835985440 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 3 May 2018 17:36:54 +0200 Subject: On windows the exports are mandatory --- framework/src/CMakeLists.txt | 5 +++++ framework/src/accounts/accountfactory.h | 3 ++- framework/src/accounts/accountsmodel.h | 4 ++-- framework/src/clipboardproxy.h | 4 +++- framework/src/domain/composercontroller.h | 4 ++-- framework/src/domain/contactcontroller.h | 4 ++-- framework/src/domain/controller.h | 4 ++-- framework/src/domain/folderlistmodel.h | 4 ++-- framework/src/domain/maillistmodel.h | 4 ++-- framework/src/domain/mime/messageparser.h | 4 ++-- framework/src/domain/mouseproxy.h | 3 ++- framework/src/domain/outboxmodel.h | 4 ++-- framework/src/domain/peoplemodel.h | 3 ++- framework/src/domain/perioddayeventmodel.h | 4 ++-- framework/src/domain/retriever.h | 4 ++-- framework/src/domain/textdocumenthandler.h | 4 ++-- framework/src/domainobjectcontroller.h | 3 ++- framework/src/extensionmodel.h | 3 ++- framework/src/fabric.h | 5 +++-- framework/src/keyring.h | 4 +++- framework/src/settings/settings.h | 3 ++- framework/src/startupcheck.h | 4 +++- framework/src/viewhighlighter.h | 4 +++- framework/src/webengineprofile.h | 4 +++- 24 files changed, 57 insertions(+), 35 deletions(-) diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt index 44d58796..e975e61e 100644 --- a/framework/src/CMakeLists.txt +++ b/framework/src/CMakeLists.txt @@ -54,6 +54,11 @@ add_library(kubeframework SHARED extensionmodel.cpp viewhighlighter.cpp ) +generate_export_header(kubeframework BASE_NAME Kube EXPORT_FILE_NAME kube_export.h) +set_target_properties(kubeframework PROPERTIES + ENABLE_EXPORTS 1 + WINDOWS_EXPORT_ALL_SYMBOLS 1 +) target_link_libraries(kubeframework sink kube_otp diff --git a/framework/src/accounts/accountfactory.h b/framework/src/accounts/accountfactory.h index 429559a1..34293bb2 100644 --- a/framework/src/accounts/accountfactory.h +++ b/framework/src/accounts/accountfactory.h @@ -19,13 +19,14 @@ #pragma once +#include "kube_export.h" #include #include /** * A factory to instantiate account-plugins. */ -class AccountFactory : public QObject +class KUBE_EXPORT AccountFactory : public QObject { Q_OBJECT Q_PROPERTY(QString accountId MEMBER mAccountId WRITE setAccountId); diff --git a/framework/src/accounts/accountsmodel.h b/framework/src/accounts/accountsmodel.h index 4991f7e0..dd9a1c0c 100644 --- a/framework/src/accounts/accountsmodel.h +++ b/framework/src/accounts/accountsmodel.h @@ -18,7 +18,7 @@ */ #pragma once - +#include "kube_export.h" #include #include #include @@ -28,7 +28,7 @@ namespace Sink { class Query; } -class AccountsModel : public QIdentityProxyModel +class KUBE_EXPORT AccountsModel : public QIdentityProxyModel { Q_OBJECT diff --git a/framework/src/clipboardproxy.h b/framework/src/clipboardproxy.h index 9a965004..549483b9 100644 --- a/framework/src/clipboardproxy.h +++ b/framework/src/clipboardproxy.h @@ -18,8 +18,10 @@ */ #pragma once +#include "kube_export.h" #include -class ClipboardProxy : public QObject + +class KUBE_EXPORT ClipboardProxy : public QObject { Q_OBJECT Q_PROPERTY(QString text READ dataText WRITE setDataText NOTIFY dataChanged) diff --git a/framework/src/domain/composercontroller.h b/framework/src/domain/composercontroller.h index 17271dce..8a831ed5 100644 --- a/framework/src/domain/composercontroller.h +++ b/framework/src/domain/composercontroller.h @@ -19,7 +19,7 @@ */ #pragma once - +#include "kube_export.h" #include #include #include @@ -46,7 +46,7 @@ class Message; class AddresseeModel; -class ComposerController : public Kube::Controller +class KUBE_EXPORT ComposerController : public Kube::Controller { Q_OBJECT diff --git a/framework/src/domain/contactcontroller.h b/framework/src/domain/contactcontroller.h index e8d06229..5b49c77b 100644 --- a/framework/src/domain/contactcontroller.h +++ b/framework/src/domain/contactcontroller.h @@ -18,7 +18,7 @@ #pragma once - +#include "kube_export.h" #include #include #include @@ -26,7 +26,7 @@ #include "controller.h" -class ContactController : public Kube::Controller +class KUBE_EXPORT ContactController : public Kube::Controller { Q_OBJECT diff --git a/framework/src/domain/controller.h b/framework/src/domain/controller.h index 9166a63a..d3c1075f 100644 --- a/framework/src/domain/controller.h +++ b/framework/src/domain/controller.h @@ -17,7 +17,7 @@ 02110-1301, USA. */ #pragma once - +#include "kube_export.h" #include #include #include @@ -69,7 +69,7 @@ private: bool mEnabled = false; }; -class ControllerAction : public ControllerState { +class KUBE_EXPORT ControllerAction : public ControllerState { Q_OBJECT public: ControllerAction(); diff --git a/framework/src/domain/folderlistmodel.h b/framework/src/domain/folderlistmodel.h index d3bef397..d367ea5f 100644 --- a/framework/src/domain/folderlistmodel.h +++ b/framework/src/domain/folderlistmodel.h @@ -19,7 +19,7 @@ */ #pragma once - +#include "kube_export.h" #include #include #include @@ -29,7 +29,7 @@ namespace Sink { class Query; } -class FolderListModel : public KRecursiveFilterProxyModel +class KUBE_EXPORT FolderListModel : public KRecursiveFilterProxyModel { Q_OBJECT diff --git a/framework/src/domain/maillistmodel.h b/framework/src/domain/maillistmodel.h index a6965915..4af13dbd 100644 --- a/framework/src/domain/maillistmodel.h +++ b/framework/src/domain/maillistmodel.h @@ -19,14 +19,14 @@ */ #pragma once - +#include "kube_export.h" #include #include #include #include -class MailListModel : public QSortFilterProxyModel +class KUBE_EXPORT MailListModel : public QSortFilterProxyModel { Q_OBJECT Q_PROPERTY (QVariant parentFolder READ parentFolder WRITE setParentFolder) diff --git a/framework/src/domain/mime/messageparser.h b/framework/src/domain/mime/messageparser.h index 785b8f47..ba85973c 100644 --- a/framework/src/domain/mime/messageparser.h +++ b/framework/src/domain/mime/messageparser.h @@ -18,7 +18,7 @@ */ #pragma once - +#include "kube_export.h" #include #include #include @@ -36,7 +36,7 @@ namespace MimeTreeParser { class ObjectTreeParser; } -class MessageParser : public QObject +class KUBE_EXPORT MessageParser : public QObject { Q_OBJECT Q_PROPERTY (QVariant message READ message WRITE setMessage) diff --git a/framework/src/domain/mouseproxy.h b/framework/src/domain/mouseproxy.h index 67b25d06..456695a0 100644 --- a/framework/src/domain/mouseproxy.h +++ b/framework/src/domain/mouseproxy.h @@ -16,9 +16,10 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "kube_export.h" #include -class MouseProxy : public QQuickItem +class KUBE_EXPORT MouseProxy : public QQuickItem { Q_OBJECT diff --git a/framework/src/domain/outboxmodel.h b/framework/src/domain/outboxmodel.h index 4be9c7f8..dc5a642a 100644 --- a/framework/src/domain/outboxmodel.h +++ b/framework/src/domain/outboxmodel.h @@ -19,7 +19,7 @@ */ #pragma once - +#include "kube_export.h" #include #include @@ -27,7 +27,7 @@ #include #include -class OutboxModel : public QSortFilterProxyModel +class KUBE_EXPORT OutboxModel : public QSortFilterProxyModel { Q_OBJECT diff --git a/framework/src/domain/peoplemodel.h b/framework/src/domain/peoplemodel.h index 69d07417..6c920252 100644 --- a/framework/src/domain/peoplemodel.h +++ b/framework/src/domain/peoplemodel.h @@ -20,6 +20,7 @@ #pragma once +#include "kube_export.h" #include #include @@ -30,7 +31,7 @@ namespace Sink { /** * A model that mixes addressbooks, contact groups and contacts */ -class PeopleModel : public QSortFilterProxyModel +class KUBE_EXPORT PeopleModel : public QSortFilterProxyModel { Q_OBJECT Q_PROPERTY (QVariant addressbook READ addressbook WRITE setAddressbook) diff --git a/framework/src/domain/perioddayeventmodel.h b/framework/src/domain/perioddayeventmodel.h index e116d9a2..ab04df50 100644 --- a/framework/src/domain/perioddayeventmodel.h +++ b/framework/src/domain/perioddayeventmodel.h @@ -20,7 +20,7 @@ */ #pragma once - +#include "kube_export.h" #include #include @@ -76,7 +76,7 @@ // | '--- List of event pointers for that day // '--- Partition / day // -class PeriodDayEventModel : public QAbstractItemModel +class KUBE_EXPORT PeriodDayEventModel : public QAbstractItemModel { Q_OBJECT diff --git a/framework/src/domain/retriever.h b/framework/src/domain/retriever.h index e454532d..0847fe67 100644 --- a/framework/src/domain/retriever.h +++ b/framework/src/domain/retriever.h @@ -18,7 +18,7 @@ */ #pragma once - +#include "kube_export.h" #include #include #include @@ -28,7 +28,7 @@ * * Assign a model that retrieves the index, set the property your interested in, and propery-bind "value". */ -class Retriever : public QObject +class KUBE_EXPORT Retriever : public QObject { Q_OBJECT Q_PROPERTY(QAbstractItemModel* model READ model WRITE setModel) diff --git a/framework/src/domain/textdocumenthandler.h b/framework/src/domain/textdocumenthandler.h index 43781940..91cd8489 100644 --- a/framework/src/domain/textdocumenthandler.h +++ b/framework/src/domain/textdocumenthandler.h @@ -17,7 +17,7 @@ 02110-1301, USA. */ #pragma once - +#include "kube_export.h" #include #include #include @@ -25,7 +25,7 @@ class QTextDocument; class QQuickTextDocument; -class TextDocumentHandler : public QObject +class KUBE_EXPORT TextDocumentHandler : public QObject { Q_OBJECT diff --git a/framework/src/domainobjectcontroller.h b/framework/src/domainobjectcontroller.h index 5805c5a8..e0d62d48 100644 --- a/framework/src/domainobjectcontroller.h +++ b/framework/src/domainobjectcontroller.h @@ -18,6 +18,7 @@ */ #pragma once +#include "kube_export.h" #include #include #include @@ -25,7 +26,7 @@ namespace Kube { -class DomainObjectController : public QObject +class KUBE_EXPORT DomainObjectController : public QObject { Q_OBJECT Q_PROPERTY(QVariant currentObject READ currentObject NOTIFY currentObjectChanged) diff --git a/framework/src/extensionmodel.h b/framework/src/extensionmodel.h index 07601e57..54cbb753 100644 --- a/framework/src/extensionmodel.h +++ b/framework/src/extensionmodel.h @@ -19,12 +19,13 @@ #pragma once +#include "kube_export.h" #include #include namespace Kube { -class ExtensionModel : public QSortFilterProxyModel +class KUBE_EXPORT ExtensionModel : public QSortFilterProxyModel { Q_OBJECT diff --git a/framework/src/fabric.h b/framework/src/fabric.h index 764c42b1..9a060cb9 100644 --- a/framework/src/fabric.h +++ b/framework/src/fabric.h @@ -18,6 +18,7 @@ */ #pragma once +#include "kube_export.h" #include #include #include @@ -32,7 +33,7 @@ namespace Kube { */ namespace Fabric { -class Fabric : public QObject { +class KUBE_EXPORT Fabric : public QObject { Q_OBJECT public: Q_INVOKABLE void postMessage(const QString &id, const QVariantMap &); @@ -48,7 +49,7 @@ public: * } * } */ -class Listener : public QObject +class KUBE_EXPORT Listener : public QObject { Q_OBJECT Q_PROPERTY(QString filter MEMBER mFilter) diff --git a/framework/src/keyring.h b/framework/src/keyring.h index 5d2c7544..1d1ee105 100644 --- a/framework/src/keyring.h +++ b/framework/src/keyring.h @@ -16,13 +16,15 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#pragma once +#include "kube_export.h" #include #include namespace Kube { -class Keyring : public QObject { +class KUBE_EXPORT Keyring : public QObject { Q_OBJECT public: Keyring(); diff --git a/framework/src/settings/settings.h b/framework/src/settings/settings.h index c5cff76b..e672913a 100644 --- a/framework/src/settings/settings.h +++ b/framework/src/settings/settings.h @@ -18,6 +18,7 @@ */ #pragma once +#include "kube_export.h" #include #include #include @@ -25,7 +26,7 @@ namespace Kube { -class Settings : public QObject { +class KUBE_EXPORT Settings : public QObject { Q_OBJECT Q_PROPERTY(QByteArray identifier READ identifier WRITE setIdentifier) public: diff --git a/framework/src/startupcheck.h b/framework/src/startupcheck.h index b8b2e3a0..6d7c8e1b 100644 --- a/framework/src/startupcheck.h +++ b/framework/src/startupcheck.h @@ -16,10 +16,12 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#pragma once +#include "kube_export.h" #include -class StartupCheck : public QObject { +class KUBE_EXPORT StartupCheck : public QObject { Q_OBJECT Q_PROPERTY(bool noAccount READ noAccount CONSTANT); public: diff --git a/framework/src/viewhighlighter.h b/framework/src/viewhighlighter.h index 00b4d4b6..2238dc72 100644 --- a/framework/src/viewhighlighter.h +++ b/framework/src/viewhighlighter.h @@ -16,13 +16,15 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#pragma once +#include "kube_export.h" #include #include class QQuickTextDocument; -class ViewHighlighter : public QObject { +class KUBE_EXPORT ViewHighlighter : public QObject { Q_OBJECT Q_PROPERTY(QString searchString WRITE setSearchString) diff --git a/framework/src/webengineprofile.h b/framework/src/webengineprofile.h index 16cea88b..3a58e23c 100644 --- a/framework/src/webengineprofile.h +++ b/framework/src/webengineprofile.h @@ -16,10 +16,12 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#pragma once +#include "kube_export.h" #include -class WebEngineProfile : public QQuickWebEngineProfile +class KUBE_EXPORT WebEngineProfile : public QQuickWebEngineProfile { Q_OBJECT public: -- cgit v1.2.3