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/serialization | |
| 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/serialization')
| -rw-r--r-- | src/corelib/serialization/qxmlstream.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/corelib/serialization/qxmlstream.h b/src/corelib/serialization/qxmlstream.h index e197a0f999..31c605c981 100644 --- a/src/corelib/serialization/qxmlstream.h +++ b/src/corelib/serialization/qxmlstream.h @@ -110,17 +110,19 @@ public: Q_DECLARE_TYPEINFO(QXmlStreamAttribute, Q_MOVABLE_TYPE); -class Q_CORE_EXPORT QXmlStreamAttributes : public QList<QXmlStreamAttribute> +// We export each out-of-line method invidually to prevent MSVC from +// exporting the whole QList class. +class QXmlStreamAttributes : public QList<QXmlStreamAttribute> { public: inline QXmlStreamAttributes() {} - QStringRef value(const QString &namespaceUri, const QString &name) const; - QStringRef value(const QString &namespaceUri, QLatin1String name) const; - QStringRef value(QLatin1String namespaceUri, QLatin1String name) const; - QStringRef value(const QString &qualifiedName) const; - QStringRef value(QLatin1String qualifiedName) const; - void append(const QString &namespaceUri, const QString &name, const QString &value); - void append(const QString &qualifiedName, const QString &value); + Q_CORE_EXPORT QStringRef value(const QString &namespaceUri, const QString &name) const; + Q_CORE_EXPORT QStringRef value(const QString &namespaceUri, QLatin1String name) const; + Q_CORE_EXPORT QStringRef value(QLatin1String namespaceUri, QLatin1String name) const; + Q_CORE_EXPORT QStringRef value(const QString &qualifiedName) const; + Q_CORE_EXPORT QStringRef value(QLatin1String qualifiedName) const; + Q_CORE_EXPORT void append(const QString &namespaceUri, const QString &name, const QString &value); + Q_CORE_EXPORT void append(const QString &qualifiedName, const QString &value); inline bool hasAttribute(const QString &qualifiedName) const { |