diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-10-11 09:47:32 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2020-08-05 21:51:24 -0700 |
| commit | 9f4c9529f609d947e2884af527208ac4c76a12d6 (patch) | |
| tree | 420ebddacc4436a0546049bd41ef6770aba88c4e /src/corelib/tools | |
| parent | e80767d1fc45cfca96694937289712f0278f4945 (diff) | |
MSVC: remove the extern template
The problem was that QtCore exported those classes deriving from
containers, which caused applications to try and import those same
functions from QtCore, depending on whether they saw the #include or
not.
Now we don't need the hack anymore.
Change-Id: I0a103569c81b4711a649fffd14ec9282454a1fdc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlist.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 35dc286191..fad61bf8e6 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -832,21 +832,6 @@ auto operator>=(const QList<T> &lhs, const QList<T> &rhs) return !(lhs < rhs); } -/* - ### Qt 5: - ### This needs to be removed for next releases of Qt. It is a workaround for vc++ because - ### Qt exports QPolygon and QPolygonF that inherit QList<QPoint> and - ### QList<QPointF> respectively. -*/ - -#if defined(Q_CC_MSVC) && !defined(QT_BUILD_CORE_LIB) -QT_BEGIN_INCLUDE_NAMESPACE -#include <QtCore/qpoint.h> -QT_END_INCLUDE_NAMESPACE -extern template class Q_CORE_EXPORT QList<QPointF>; -extern template class Q_CORE_EXPORT QList<QPoint>; -#endif - QList<uint> QStringView::toUcs4() const { return QtPrivate::convertToUcs4(*this); } QT_END_NAMESPACE |