aboutsummaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2023-04-07 16:21:10 +0200
committerLinus Jahn <lnj@kaidan.im>2023-04-07 16:21:10 +0200
commitab4bdf2da41a26f462fe3a333a34e32c999e2a6d (patch)
tree2501bde9b6da885056166c769befa7f7d4729e49 /src/base
parentc8e13f6fd3df8dcab0170dda6f54eaf5175d8437 (diff)
parentb44a7ee310bd2c9bc7c0d234ab7a96c501d20559 (diff)
downloadqxmpp-ab4bdf2da41a26f462fe3a333a34e32c999e2a6d.tar.gz
Merge branch '1.5'
Diffstat (limited to 'src/base')
-rw-r--r--src/base/QXmppMamIq.h4
-rw-r--r--src/base/QXmppPubSubIq_p.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/base/QXmppMamIq.h b/src/base/QXmppMamIq.h
index 6a1df144..78d5c77a 100644
--- a/src/base/QXmppMamIq.h
+++ b/src/base/QXmppMamIq.h
@@ -14,7 +14,7 @@
class QXmppMamQueryIqPrivate;
class QXmppMamResultIqPrivate;
-class QXmppMamQueryIq : public QXmppIq
+class QXMPP_EXPORT QXmppMamQueryIq : public QXmppIq
{
public:
QXmppMamQueryIq();
@@ -46,7 +46,7 @@ private:
QSharedDataPointer<QXmppMamQueryIqPrivate> d;
};
-class QXmppMamResultIq : public QXmppIq
+class QXMPP_EXPORT QXmppMamResultIq : public QXmppIq
{
public:
QXmppMamResultIq();
diff --git a/src/base/QXmppPubSubIq_p.h b/src/base/QXmppPubSubIq_p.h
index c8828579..0ff1de04 100644
--- a/src/base/QXmppPubSubIq_p.h
+++ b/src/base/QXmppPubSubIq_p.h
@@ -152,7 +152,7 @@ void PubSubIq<T>::parseItems(const QDomElement &queryElement)
childElement = childElement.nextSiblingElement(QStringLiteral("item"))) {
T item;
item.parse(childElement);
- m_items << std::move(item);
+ m_items.push_back(std::move(item));
}
}