[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-frameworks-devel
Subject:    Re: kservice_to_json dependency troubles
From:       Aurélien_Gâteau <agateau () kde ! org>
Date:       2013-11-07 10:07:43
Message-ID: 35132.109.13.158.252.1383818863.squirrel () webmail ! tuffmail ! net
[Download RAW message or body]

Forgot the patch :/
["0001-Add-test-for-kservice_desktop_to_json.patch" (text/x-patch)]

From 097d935f32683a8c79dc09f6c7207af02ed8243d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aurélien Gâteau?= <agateau@kde.org>
Date: Thu, 7 Nov 2013 10:37:22 +0100
Subject: [PATCH] Add test for kservice_desktop_to_json

---
 tier3/kservice/src/desktoptojson/CMakeLists.txt |  1 +
 tier3/kservice/tests/CMakeLists.txt             |  7 +++++++
 tier3/kservice/tests/dummy-service.desktop      | 10 ++++++++++
 tier3/kservice/tests/dummyplugin.cpp            |  9 +++++++++
 tier3/kservice/tests/dummyplugin.h              | 13 +++++++++++++
 5 files changed, 40 insertions(+)
 create mode 100644 tier3/kservice/tests/dummy-service.desktop
 create mode 100644 tier3/kservice/tests/dummyplugin.cpp
 create mode 100644 tier3/kservice/tests/dummyplugin.h

diff --git a/tier3/kservice/src/desktoptojson/CMakeLists.txt \
b/tier3/kservice/src/desktoptojson/CMakeLists.txt index 9dc8635..afe21f2 100644
--- a/tier3/kservice/src/desktoptojson/CMakeLists.txt
+++ b/tier3/kservice/src/desktoptojson/CMakeLists.txt
@@ -4,6 +4,7 @@ add_executable(desktoptojson
     main.cpp
     kconfigtojson.cpp
 )
+add_executable(KF5::desktoptojson ALIAS desktoptojson)

 target_link_libraries(desktoptojson
     Qt5::Core
diff --git a/tier3/kservice/tests/CMakeLists.txt \
b/tier3/kservice/tests/CMakeLists.txt index 70c450c..4f03aac 100644
--- a/tier3/kservice/tests/CMakeLists.txt
+++ b/tier3/kservice/tests/CMakeLists.txt
@@ -30,3 +30,10 @@ ecm_mark_as_test(kmimeassociationstest)

 target_link_libraries(kmimeassociationstest KService KF5::KConfigCore Qt5::Test)
 target_include_directories(kmimeassociationstest PRIVATE \
"${CMAKE_CURRENT_SOURCE_DIR}/../src/kbuildsycoca/") +
+######### kservicetojsontest ########
+include(../KServiceMacros.cmake)
+kservice_desktop_to_json(dummy-service.desktop)
+add_library(kservicetojsontest dummyplugin.cpp)
+target_link_libraries(kservicetojsontest KF5::KService)
+target_include_directories(kservicetojsontest PRIVATE \
                "${CMAKE_CURRENT_SOURCE_DIR}/../src/plugin/")
diff --git a/tier3/kservice/tests/dummy-service.desktop \
b/tier3/kservice/tests/dummy-service.desktop new file mode 100644
index 0000000..217e6de
--- /dev/null
+++ b/tier3/kservice/tests/dummy-service.desktop
@@ -0,0 +1,10 @@
+[Desktop entry]
+Type=Service
+Icon+Name=Dummy
+ServiceTypes=Dummy
+X-KDE-Library=kservicetojsontest
+X-KDE-PluginInfo-Author=Aurélien Gâteau
+X-KDE-PluginInfo-Email=agateau@kde.org
+X-KDE-PluginInfo-Name=kservicetojsontest
+X-KDE-PluginInfo-Version= °.1
diff --git a/tier3/kservice/tests/dummyplugin.cpp \
b/tier3/kservice/tests/dummyplugin.cpp new file mode 100644
index 0000000..ca6acdb
--- /dev/null
+++ b/tier3/kservice/tests/dummyplugin.cpp
@@ -0,0 +1,9 @@
+#include <dummyplugin.h>
+#include <kpluginfactory.h>
+
+DummyPlugin::DummyPlugin(QObject*, const QVariantList&)
+{}
+
+K_PLUGIN_FACTORY_WITH_JSON(DummyPluginFactory, "dummy-service.json", \
registerPlugin<DummyPlugin>();) +
+#include <dummyplugin.moc>
diff --git a/tier3/kservice/tests/dummyplugin.h b/tier3/kservice/tests/dummyplugin.h
new file mode 100644
index 0000000..33b1403
--- /dev/null
+++ b/tier3/kservice/tests/dummyplugin.h
@@ -0,0 +1,13 @@
+#ifndef DUMMYPLUGIN_H
+#define DUMMYPLUGIN_H
+
+#include <QObject>
+
+class DummyPlugin : public QObject
+{
+    Q_OBJECT
+public:
+    DummyPlugin(QObject*, const QVariantList&);
+};
+
+#endif /* DUMMYPLUGIN_H */
--
1.8.3.2



_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


[prev in list] [next in list] [prev in thread] [next in thread]