aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2013-01-11 14:50:28 +0100
committerJeremy Lainé <jeremy.laine@m4x.org>2013-01-11 14:50:28 +0100
commita662808a8015b91b773895c4dbbc9c2d4a655a6b (patch)
treeebbad8c31accf9195f512f4a996b328092bb258f
parentde324a5c110a975b8b8450d2acd78e338aa27734 (diff)
downloadqxmpp-a662808a8015b91b773895c4dbbc9c2d4a655a6b.tar.gz
bump version to 0.7.5
-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 cbef07c2..36098836 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+QXmpp 0.7.5 (Jan 11, 2013)
+--------------------------
+
+ - Replace toAscii/fromAscii with toLatin1/fromLatin1 for Qt 5 compatibility.
+ - Fix build using clang in pedantic mode.
+
QXmpp 0.7.4 (Oct 1, 2012)
-------------------------
diff --git a/qxmpp.pri b/qxmpp.pri
index a8d116b9..76317b9c 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -1,7 +1,7 @@
# Common definitions
QT += network xml
-QXMPP_VERSION = 0.7.4
+QXMPP_VERSION = 0.7.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 a0d99394..20b8e96b 100644
--- a/src/base/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
@@ -52,7 +52,7 @@
/// available.
///
-#define QXMPP_VERSION 0x000704
+#define QXMPP_VERSION 0x000705
QXMPP_EXPORT QString QXmppVersion();
diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp
index f4ba194f..3f995e95 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.7.4"));
+ QCOMPARE(QXmppVersion(), QString("0.7.5"));
}
void tst_QXmppUtils::testTimezoneOffset()