From 7039480c301af97581728bdd4ab501c6ee095ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anthony=20L=C3=A9onard?=
<anthony.leonard@savoirfairelinux.com>
Date: Thu, 24 Aug 2017 15:54:15 -0400
Subject: [PATCH] define LRC_IMPORT for DLL import on win32
This patch is meant to be used with corresponding LRC patch fixing
DLL symbols export/import. With LRC_IMPORT defined, Q_DECL_IMPORT is
automatically specified on every class of LRC which are, respectively,
declared Q_DECL_EXPORT during LRC build.
One exception is AccountSerializationAdapter which is exported from
the client and not LRC.
This patch fixes new style's connect() (functor-based) which were not
possible at all with signals introduced with LRC. Especially, it
enables connecting signals with lambda's and compile-time checking of
signals connection.
Change-Id: Ie4f68038b2ba1a524c7a63126fcb0660e3d8cd85
Reviewed-by: Olivier Soldano <olivier.soldano@savoirfairelinux.com>
---
RingWinClient.pro | 1 +
accountserializationadapter.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/RingWinClient.pro b/RingWinClient.pro
index 7dc0088..1499d26 100644
--- a/RingWinClient.pro
+++ b/RingWinClient.pro
@@ -23,6 +23,7 @@ DEFINES += VERSION=\\\"$$VERSION\\\"
DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\"
DEFINES += NIGHTLY_VERSION=\\\"$$NIGHTLY_VERSION\\\"
DEFINES += RING_CLIENT_BUILD_DATE=\"\\\"$$RING_CLIENT_BUILD_DATE\\\"\"
+DEFINES += LRC_IMPORT
BUILD=$${BUILD}
TARGET = Ring
diff --git a/accountserializationadapter.h b/accountserializationadapter.h
index d4acfbd..b4fe686 100644
--- a/accountserializationadapter.h
+++ b/accountserializationadapter.h
@@ -34,7 +34,7 @@ class Account;
*
* * QLineEdit
*/
-class LIB_EXPORT AccountSerializationAdapter : public QObject
+class Q_DECL_EXPORT AccountSerializationAdapter : public QObject
{
Q_OBJECT
public:
--
GitLab