aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-07-20 18:34:41 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-07-20 18:34:41 +0200
commitbb1ba37c129e610b5ac75a3e0caabe0b013c6123 (patch)
treee126ebdb3e4ef359cf7d1ce4a1f90063e4ebdebf
parent1b653eb9e6212678297281f5bca43bcd0b1a00fb (diff)
downloadqxmpp-bb1ba37c129e610b5ac75a3e0caabe0b013c6123.tar.gz
bump version
-rw-r--r--CHANGELOG7
-rw-r--r--qxmpp.pri2
-rw-r--r--src/base/QXmppGlobal.h2
-rw-r--r--tests/tests.cpp2
4 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 88951a95..e37c9b14 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-QXmpp 0.6.0 (UNRELEASED)
-------------------------
+QXmpp 0.5.5 (Jul 20, 2012)
+--------------------------
- New XEPs
* XEP-0221: Data Forms Media Element
@@ -9,6 +9,9 @@ QXmpp 0.6.0 (UNRELEASED)
- Deprecate QXmppConfiguration::setSASLAuthMechanism(), replaced by
the string-based QXmppConfiguration::setSaslAuthMechanism().
+ - Fix issues:
+ * Issue 126: Modularize SASL mechanisms
+
QXmpp 0.5.0 (Jul 18, 2012)
--------------------------
diff --git a/qxmpp.pri b/qxmpp.pri
index 3ec41f6c..6f98d8a3 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -1,7 +1,7 @@
# Common definitions
QT += network xml
-QXMPP_VERSION = 0.5.0
+QXMPP_VERSION = 0.5.5
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 abfdf5b6..56a608ae 100644
--- a/src/base/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
@@ -46,7 +46,7 @@
/// available.
///
-#define QXMPP_VERSION 0x000500
+#define QXMPP_VERSION 0x000505
QXMPP_EXPORT QString QXmppVersion();
diff --git a/tests/tests.cpp b/tests/tests.cpp
index 2602314a..cd987a22 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -136,7 +136,7 @@ void TestUtils::testMime()
void TestUtils::testLibVersion()
{
- QCOMPARE(QXmppVersion(), QString("0.5.0"));
+ QCOMPARE(QXmppVersion(), QString("0.5.5"));
}
void TestUtils::testTimezoneOffset()