bump version, make internal auto-tests optional

5 files changed, 20 insertions, 13 deletions

diff --git a/CHANGELOG b/CHANGELOG
index d9a86271..f4e36f6c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+QXmpp 0.6.2 (UNRELEASED)
+------------------------
+
+  - Improve SASL code test coverage.
+  - Improve QXmppMessage test coverage.
+
 QXmpp 0.6.1 (Jul 20, 2012)
 --------------------------
 
diff --git a/qxmpp.pri b/qxmpp.pri
index bf507d0d..228d5695 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -1,7 +1,7 @@
 # Common definitions
 
 QT += network xml
-QXMPP_VERSION = 0.6.1
+QXMPP_VERSION = 0.6.2
 QXMPP_INCLUDEPATH = $$PWD/src/base $$PWD/src/client $$PWD/src/server
 
 # Determine library name
@@ -53,3 +53,8 @@ isEmpty(PREFIX) {
 isEmpty(LIBDIR) {
     LIBDIR=lib
 }
+
+# Internal API auto-tests
+!isEmpty(QXMPP_AUTOTEST_INTERNAL) {
+    DEFINES += QXMPP_AUTOTEST_INTERNAL
+}
diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h
index 1ef6e92c..55899a46 100644
--- a/src/base/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
@@ -37,7 +37,7 @@
 #  endif
 #endif
 
-#if defined(QXMPP_BUILD_INTERNAL)
+#if defined(QXMPP_AUTOTEST_INTERNAL)
 #    define QXMPP_AUTOTEST_EXPORT QXMPP_EXPORT
 #else
 #    define QXMPP_AUTOTEST_EXPORT
@@ -52,7 +52,7 @@
 /// available.
 ///
 
-#define QXMPP_VERSION 0x000601
+#define QXMPP_VERSION 0x000602
 
 QXMPP_EXPORT QString QXmppVersion();
 
diff --git a/tests/tests.cpp b/tests/tests.cpp
index e08cfb8d..46e04aab 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -134,7 +134,7 @@ void TestUtils::testMime()
 
 void TestUtils::testLibVersion()
 {
-    QCOMPARE(QXmppVersion(), QString("0.6.1"));
+    QCOMPARE(QXmppVersion(), QString("0.6.2"));
 }
 
 void TestUtils::testTimezoneOffset()
@@ -1199,7 +1199,7 @@ int main(int argc, char *argv[])
     TestPackets testPackets;
     errors += QTest::qExec(&testPackets);
 
-#ifndef Q_OS_WIN
+#ifdef QXMPP_AUTOTEST_INTERNAL
     TestCodec testCodec;
     errors += QTest::qExec(&testCodec);
 #endif
@@ -1228,7 +1228,7 @@ int main(int argc, char *argv[])
     tst_QXmppRtpPacket testRtp;
     errors += QTest::qExec(&testRtp);
 
-#ifndef Q_OS_WIN
+#ifdef QXMPP_AUTOTEST_INTERNAL
     tst_QXmppSasl testSasl;
     errors += QTest::qExec(&testSasl);
 
diff --git a/tests/tests.pro b/tests/tests.pro
index 1362e9a4..9fabdf6f 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -6,7 +6,6 @@ TARGET = qxmpp-tests
 
 RESOURCES += tests.qrc
 SOURCES += \
-    codec.cpp \
     dataform.cpp \
     jingle.cpp \
     message.cpp \
@@ -14,10 +13,8 @@ SOURCES += \
     register.cpp \
     rsm.cpp \
     rtp.cpp \
-    sasl.cpp \
     tests.cpp
 HEADERS += \
-    codec.h \
     dataform.h \
     jingle.h \
     message.h \
@@ -25,12 +22,11 @@ HEADERS += \
     register.h \
     rsm.h \
     rtp.h \
-    sasl.h \
     tests.h
 
-win32 {
-    HEADERS -= codec.h sasl.h
-    SOURCES -= codec.cpp sasl.cpp
+!isEmpty(QXMPP_AUTOTEST_INTERNAL) {
+    HEADERS += codec.h sasl.h
+    SOURCES += codec.cpp sasl.cpp
 }
 
 INCLUDEPATH += $$QXMPP_INCLUDEPATH