aboutsummaryrefslogtreecommitdiff
path: root/tests/qxmpputils
diff options
context:
space:
mode:
authorNiels Ole Salscheider <niels_ole@salscheider-online.de>2018-06-23 17:20:47 +0200
committerGitHub <noreply@github.com>2018-06-23 17:20:47 +0200
commited6b199dff15ddb4c6bd72d1565501e9f1a2bf87 (patch)
tree7bbb53c40ecf53fe9464b53b7966dd7726eeac5e /tests/qxmpputils
parentea83c77a5a4524cc9778336b10eff60979582980 (diff)
parent31f0a42073b68823e85835ec3e25114d79705a04 (diff)
downloadqxmpp-ed6b199dff15ddb4c6bd72d1565501e9f1a2bf87.tar.gz
Merge pull request #131 from olesalscheider/cmake
Add CMake build system, drop Qt4 support
Diffstat (limited to 'tests/qxmpputils')
-rw-r--r--tests/qxmpputils/CMakeLists.txt3
-rw-r--r--tests/qxmpputils/qxmpputils.pro4
-rw-r--r--tests/qxmpputils/tst_qxmpputils.cpp6
3 files changed, 3 insertions, 10 deletions
diff --git a/tests/qxmpputils/CMakeLists.txt b/tests/qxmpputils/CMakeLists.txt
new file mode 100644
index 00000000..fbab1e64
--- /dev/null
+++ b/tests/qxmpputils/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_executable(tst_qxmpputils tst_qxmpputils.cpp tst_qxmpputils.qrc)
+add_test(tst_qxmpputils tst_qxmpputils)
+target_link_libraries(tst_qxmpputils Qt5::Test qxmpp)
diff --git a/tests/qxmpputils/qxmpputils.pro b/tests/qxmpputils/qxmpputils.pro
deleted file mode 100644
index 70c1b9bf..00000000
--- a/tests/qxmpputils/qxmpputils.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmpputils
-RESOURCES += tst_qxmpputils.qrc
-SOURCES += tst_qxmpputils.cpp
diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp
index b2359d57..6a3958f0 100644
--- a/tests/qxmpputils/tst_qxmpputils.cpp
+++ b/tests/qxmpputils/tst_qxmpputils.cpp
@@ -35,7 +35,6 @@ private slots:
void testHmac();
void testJid();
void testMime();
- void testLibVersion();
void testTimezoneOffset();
};
@@ -112,11 +111,6 @@ void tst_QXmppUtils::testMime()
}
#endif
-void tst_QXmppUtils::testLibVersion()
-{
- QCOMPARE(QXmppVersion(), QString("0.9.3"));
-}
-
void tst_QXmppUtils::testTimezoneOffset()
{
// parsing