summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2019-09-18 14:43:08 +0200
committerDavid Schulz <david.schulz@qt.io>2019-09-19 08:54:06 +0000
commitf7453adda255960c3ebc855ec2a83897441494e0 (patch)
tree365fba39c3321b1cb2964c5324f075eb4fcf6b6b
parent59c4d921868ab95c37dca1d882673ac7873ef12d (diff)
downloadqt-creator-f7453adda255960c3ebc855ec2a83897441494e0.tar.gz
LanguageClient: export manager, client and settings
Change-Id: I8827fb1c36a41ab76b9509cdbf008e9f2309fd6c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/languageclient/client.h3
-rw-r--r--src/plugins/languageclient/languageclient_global.h6
-rw-r--r--src/plugins/languageclient/languageclientmanager.h3
-rw-r--r--src/plugins/languageclient/languageclientsettings.h8
4 files changed, 15 insertions, 5 deletions
diff --git a/src/plugins/languageclient/client.h b/src/plugins/languageclient/client.h
index e35afd0890..ab874e8569 100644
--- a/src/plugins/languageclient/client.h
+++ b/src/plugins/languageclient/client.h
@@ -27,6 +27,7 @@
#include "documentsymbolcache.h"
#include "dynamiccapabilities.h"
+#include "languageclient_global.h"
#include "languageclientcompletionassist.h"
#include "languageclientfunctionhint.h"
#include "languageclientquickfix.h"
@@ -67,7 +68,7 @@ namespace LanguageClient {
class BaseClientInterface;
class TextMark;
-class Client : public QObject
+class LANGUAGECLIENT_EXPORT Client : public QObject
{
Q_OBJECT
diff --git a/src/plugins/languageclient/languageclient_global.h b/src/plugins/languageclient/languageclient_global.h
index 685379804d..7df176603f 100644
--- a/src/plugins/languageclient/languageclient_global.h
+++ b/src/plugins/languageclient/languageclient_global.h
@@ -27,6 +27,12 @@
#include <QtGlobal>
+#if defined(LANGUAGECLIENT_LIBRARY)
+# define LANGUAGECLIENT_EXPORT Q_DECL_EXPORT
+#else
+# define LANGUAGECLIENT_EXPORT Q_DECL_IMPORT
+#endif
+
namespace LanguageClient {
namespace Constants {
diff --git a/src/plugins/languageclient/languageclientmanager.h b/src/plugins/languageclient/languageclientmanager.h
index 8c03eaa26b..2b9542dc48 100644
--- a/src/plugins/languageclient/languageclientmanager.h
+++ b/src/plugins/languageclient/languageclientmanager.h
@@ -26,6 +26,7 @@
#pragma once
#include "client.h"
+#include "languageclient_global.h"
#include "languageclientsettings.h"
#include "locatorfilter.h"
@@ -46,7 +47,7 @@ namespace LanguageClient {
class LanguageClientMark;
-class LanguageClientManager : public QObject
+class LANGUAGECLIENT_EXPORT LanguageClientManager : public QObject
{
Q_OBJECT
public:
diff --git a/src/plugins/languageclient/languageclientsettings.h b/src/plugins/languageclient/languageclientsettings.h
index 348e1d293c..79657409cf 100644
--- a/src/plugins/languageclient/languageclientsettings.h
+++ b/src/plugins/languageclient/languageclientsettings.h
@@ -25,6 +25,8 @@
#pragma once
+#include "languageclient_global.h"
+
#include <coreplugin/dialogs/ioptionspage.h>
#include <QAbstractItemModel>
@@ -51,7 +53,7 @@ namespace LanguageClient {
class Client;
class BaseClientInterface;
-struct LanguageFilter
+struct LANGUAGECLIENT_EXPORT LanguageFilter
{
QStringList mimeTypes;
QStringList filePattern;
@@ -59,7 +61,7 @@ struct LanguageFilter
bool isSupported(const Core::IDocument *document) const;
};
-class BaseSettings
+class LANGUAGECLIENT_EXPORT BaseSettings
{
public:
BaseSettings() = default;
@@ -100,7 +102,7 @@ private:
bool canStart(QList<const Core::IDocument *> documents) const;
};
-class StdIOSettings : public BaseSettings
+class LANGUAGECLIENT_EXPORT StdIOSettings : public BaseSettings
{
public:
StdIOSettings() = default;