aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-11-26 12:29:41 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2015-12-01 08:16:22 +0000
commitf253f76aca4eb82a6df11c00a25c178e16253c9d (patch)
tree55cce4f2f0bb9c9d8c624ff06863a69bd8f2e90f
parent2550ec1cbeaf1c0cfa14d996763c14c35304d205 (diff)
Do not export fully inlined class
Exporting a class deriving from QPair fails in MSVC 2015 RTM after commit 226ce6020ee4eb in qtbase. Task-number: QTBUG-49658 Change-Id: Id07e620a4a2d0f454232f349a51380170f5230ce Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
-rw-r--r--src/enginio_client/enginioclient_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/enginio_client/enginioclient_p.h b/src/enginio_client/enginioclient_p.h
index 6b5dc53..fc3cbcb 100644
--- a/src/enginio_client/enginioclient_p.h
+++ b/src/enginio_client/enginioclient_p.h
@@ -85,7 +85,7 @@ class ENGINIOCLIENT_EXPORT EnginioClientConnectionPrivate : public QObjectPrivat
{
enum PathOptions { Default, RequireIdInPath = 1};
- struct ENGINIOCLIENT_EXPORT GetPathReturnValue : public QPair<bool, QString>
+ struct GetPathReturnValue : public QPair<bool, QString>
{
GetPathReturnValue(bool value)
: QPair<bool, QString>(value, QString())