aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-07-20 18:37:41 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-07-20 18:37:41 +0200
commitde61ab48e3fbe594494bd9f540e44c82505e74fb (patch)
treebcf3d37178a3404f301a88514acb94b05e4a7e77
parentbb1ba37c129e610b5ac75a3e0caabe0b013c6123 (diff)
downloadqxmpp-de61ab48e3fbe594494bd9f540e44c82505e74fb.tar.gz
bump version to 0.6.0
-rw-r--r--CHANGELOG3
-rw-r--r--qxmpp.pri2
-rw-r--r--src/base/QXmppGlobal.h2
-rw-r--r--tests/tests.cpp2
4 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e37c9b14..58242ddc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-QXmpp 0.5.5 (Jul 20, 2012)
+QXmpp 0.6.0 (Jul 20, 2012)
--------------------------
- New XEPs
@@ -10,6 +10,7 @@ QXmpp 0.5.5 (Jul 20, 2012)
the string-based QXmppConfiguration::setSaslAuthMechanism().
- Fix issues:
+ * Issue 111: QXmppPresence::Status::getTypeStr() gives warning if type is invisible
* Issue 126: Modularize SASL mechanisms
QXmpp 0.5.0 (Jul 18, 2012)
diff --git a/qxmpp.pri b/qxmpp.pri
index 6f98d8a3..b68e0e09 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -1,7 +1,7 @@
# Common definitions
QT += network xml
-QXMPP_VERSION = 0.5.5
+QXMPP_VERSION = 0.6.0
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 56a608ae..d3799d5c 100644
--- a/src/base/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
@@ -46,7 +46,7 @@
/// available.
///
-#define QXMPP_VERSION 0x000505
+#define QXMPP_VERSION 0x000600
QXMPP_EXPORT QString QXmppVersion();
diff --git a/tests/tests.cpp b/tests/tests.cpp
index cd987a22..6a972388 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -136,7 +136,7 @@ void TestUtils::testMime()
void TestUtils::testLibVersion()
{
- QCOMPARE(QXmppVersion(), QString("0.5.5"));
+ QCOMPARE(QXmppVersion(), QString("0.6.0"));
}
void TestUtils::testTimezoneOffset()