From 057ef7ee6e0db9c9d9028b75195015e554d1d99f 2017-07-05 09:39:07 From: Alexandre Leroux Date: 2017-07-05 09:39:07 Subject: [PATCH] Adds Q_DECL_EXPORT for Mock plugin --- diff --git a/plugins/mockplugin/CMakeLists.txt b/plugins/mockplugin/CMakeLists.txt index b9a710a..cd13806 100644 --- a/plugins/mockplugin/CMakeLists.txt +++ b/plugins/mockplugin/CMakeLists.txt @@ -38,6 +38,9 @@ FILE (GLOB_RECURSE PLUGIN_FILE ${RESOURCES_DIR}/mockplugin.json) # # Compile the library # + +ADD_DEFINITIONS(-DMOCKPLUGIN_LIB) + FILE (GLOB_RECURSE MODULE_SOURCES ${INCLUDES_DIR}/*.h ${SOURCES_DIR}/*.c diff --git a/plugins/mockplugin/include/CosinusProvider.h b/plugins/mockplugin/include/CosinusProvider.h index bd5be77..7fbe76e 100644 --- a/plugins/mockplugin/include/CosinusProvider.h +++ b/plugins/mockplugin/include/CosinusProvider.h @@ -1,6 +1,8 @@ #ifndef SCIQLOP_COSINUSPROVIDER_H #define SCIQLOP_COSINUSPROVIDER_H +#include "MockPluginGlobal.h" + #include #include @@ -10,7 +12,7 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_CosinusProvider) /** * @brief The CosinusProvider class is an example of how a data provider can generate data */ -class CosinusProvider : public IDataProvider { +class SCIQLOP_MOCKPLUGIN_EXPORT CosinusProvider : public IDataProvider { public: /// @sa IDataProvider::retrieveData() std::shared_ptr diff --git a/plugins/mockplugin/include/MockPlugin.h b/plugins/mockplugin/include/MockPlugin.h index 889705e..5f53e07 100644 --- a/plugins/mockplugin/include/MockPlugin.h +++ b/plugins/mockplugin/include/MockPlugin.h @@ -1,6 +1,8 @@ #ifndef SCIQLOP_MOCKPLUGIN_H #define SCIQLOP_MOCKPLUGIN_H +#include "MockPluginGlobal.h" + #include #include @@ -11,7 +13,7 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_MockPlugin) class DataSourceItem; -class MockPlugin : public QObject, public IPlugin { +class SCIQLOP_MOCKPLUGIN_EXPORT MockPlugin : public QObject, public IPlugin { Q_OBJECT Q_INTERFACES(IPlugin) Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE "mockplugin.json") diff --git a/plugins/mockplugin/include/MockPluginGlobal.h b/plugins/mockplugin/include/MockPluginGlobal.h new file mode 100644 index 0000000..e40faf9 --- /dev/null +++ b/plugins/mockplugin/include/MockPluginGlobal.h @@ -0,0 +1,12 @@ +#ifndef SCIQLOP_MOCKPLUGINGLOBAL_H +#define SCIQLOP_MOCKPLUGINGLOBAL_H + +#include + +#if defined(MOCKPLUGIN_LIB) +#define SCIQLOP_MOCKPLUGIN_EXPORT Q_DECL_EXPORT +#else +#define SCIQLOP_MOCKPLUGIN_EXPORT Q_DECL_IMPORT +#endif + +#endif // SCIQLOP_MOCKPLUGINGLOBAL_H