From de46e34ca67eba6191768338bb87781e65e6a1a1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira <thiago.macieira@intel.com> Date: Mon, 10 Apr 2017 10:39:02 -0700 Subject: [PATCH] Fix DLL linkage of operator>>(QDataStream, QDoubleMatrix4x4) It's marked as exported from QtGui, yet the implementation is in qdoublematrix.cpp. That cannot be. Found by MSVC 2015: qdoublematrix4x4.cpp(1097): warning C4273: 'operator >>': inconsistent dll linkage qdoublematrix4x4_p.h(939): note: see previous definition of '>>' Change-Id: I523b0abacd5148b2bf08fffd14b419faf3d1e584 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> --- src/positioning/qdoublematrix4x4_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/positioning/qdoublematrix4x4_p.h b/src/positioning/qdoublematrix4x4_p.h index 3ce7b312a..d8f6b1f61 100644 --- a/src/positioning/qdoublematrix4x4_p.h +++ b/src/positioning/qdoublematrix4x4_p.h @@ -936,7 +936,7 @@ Q_POSITIONING_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QDoubleMatrix4x #ifndef QT_NO_DATASTREAM Q_POSITIONING_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDoubleMatrix4x4 &); -Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QDoubleMatrix4x4 &); +Q_POSITIONING_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDoubleMatrix4x4 &); #endif -- GitLab