diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-10 10:39:02 -0700 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-04-11 09:01:28 +0000 |
| commit | de46e34ca67eba6191768338bb87781e65e6a1a1 (patch) | |
| tree | f696f046f096a4d6e349a93cf11c3bdbd4fdc091 /src/positioning | |
| parent | 3f278a5cee03ffe16547acb496cad2eabf9cfe32 (diff) | |
| download | qtlocation-de46e34ca67eba6191768338bb87781e65e6a1a1.tar.gz | |
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>
Diffstat (limited to 'src/positioning')
| -rw-r--r-- | src/positioning/qdoublematrix4x4_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/positioning/qdoublematrix4x4_p.h b/src/positioning/qdoublematrix4x4_p.h index 3ce7b312..d8f6b1f6 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 |