aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2015-09-02 16:45:37 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2015-09-02 16:45:37 +0200
commit73d9aa8badbf4cabf55fcc740cc79ec0d4b528f9 (patch)
treeb6a2e704697b79735f569e32668f4d52dc335ab8
parent4ca7f04b6b8eedfd23a67143f1885901842ee011 (diff)
downloadqxmpp-73d9aa8badbf4cabf55fcc740cc79ec0d4b528f9.tar.gz
bump version to 0.9.2
-rw-r--r--CHANGELOG6
-rw-r--r--qxmpp.pri2
-rw-r--r--src/base/QXmppGlobal.h2
-rw-r--r--tests/qxmpputils/tst_qxmpputils.cpp2
4 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6d5f4da8..01ec1075 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+QXmpp 0.9.2 (Sep 2, 2015)
+-------------------------
+
+ - Fix build error for debug builds.
+ - Allow QXmppJingleIq to have multiple contents.
+
QXmpp 0.9.1 (Aug 30, 2015)
--------------------------
diff --git a/qxmpp.pri b/qxmpp.pri
index fc4438bd..e3c651ba 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -1,7 +1,7 @@
# Common definitions
QT += network xml
-QXMPP_VERSION = 0.9.1
+QXMPP_VERSION = 0.9.2
QXMPP_INCLUDEPATH = $$PWD/src/base $$PWD/src/client $$PWD/src/server
# Determine library name
diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h
index f6373f08..01826e44 100644
--- a/src/base/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
@@ -52,7 +52,7 @@
/// available.
///
-#define QXMPP_VERSION 0x000901
+#define QXMPP_VERSION 0x000902
QXMPP_EXPORT QString QXmppVersion();
diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp
index f14eacc8..55314823 100644
--- a/tests/qxmpputils/tst_qxmpputils.cpp
+++ b/tests/qxmpputils/tst_qxmpputils.cpp
@@ -114,7 +114,7 @@ void tst_QXmppUtils::testMime()
void tst_QXmppUtils::testLibVersion()
{
- QCOMPARE(QXmppVersion(), QString("0.9.1"));
+ QCOMPARE(QXmppVersion(), QString("0.9.2"));
}
void tst_QXmppUtils::testTimezoneOffset()