diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-14 21:58:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-14 22:02:55 +0100 |
| commit | 00935bf8c29d54fcd794ce5673cb5f973808cbf9 (patch) | |
| tree | 52b470f84397b023edeb67e8ec42c01337825980 /src/corelib/tools | |
| parent | 6292ecdf6da6c13942dd3f39c9cd164c29c7ab37 (diff) | |
| parent | cfd069181c01bbade16c173a96100819aa719613 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
src/gui/painting/qcoregraphics.mm
Change-Id: I4d49535cd75f2cdf0151c1dbff312cce5e159760
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qvector.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 4dbf95c315..5225b68d40 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -982,11 +982,13 @@ QT_BEGIN_INCLUDE_NAMESPACE #include <QtCore/qpoint.h> QT_END_INCLUDE_NAMESPACE +#ifndef Q_TEMPLATE_EXTERN #if defined(QT_BUILD_CORE_LIB) #define Q_TEMPLATE_EXTERN #else #define Q_TEMPLATE_EXTERN extern #endif +#endif Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QVector<QPointF>; Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QVector<QPoint>; #endif |