浏览代码

Fix the QtMobility EventBus service.

Sascha Zelzer 14 年之前
父节点
当前提交
8af00a9f54
共有 2 个文件被更改,包括 9 次插入3 次删除
  1. 6 1
      Plugins/org.commontk.eventbus/CMakeLists.txt
  2. 3 2
      Plugins/org.commontk.eventbus/servicedescriptor.xml

+ 6 - 1
Plugins/org.commontk.eventbus/CMakeLists.txt

@@ -14,7 +14,11 @@ SET(PLUGIN_MOC_SRCS
 )
 
 SET(PLUGIN_resources
-  org_commontk_eventbus.qrc
+  #org_commontk_eventbus.qrc
+)
+
+SET(PLUGIN_CACHED_RESOURCEFILES
+  servicedescriptor.xml
 )
 
 ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
@@ -24,5 +28,6 @@ ctkMacroBuildPlugin(
   SRCS ${PLUGIN_SRCS}
   MOC_SRCS ${PLUGIN_MOC_SRCS}
   RESOURCES ${PLUGIN_resources}
+  CACHED_RESOURCEFILES ${PLUGIN_CACHED_RESOURCEFILES}
   TARGET_LIBRARIES ${PLUGIN_target_libraries}
 )

+ 3 - 2
Plugins/org.commontk.eventbus/servicedescriptor.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <service>
-  <name>ctkEventBus</name>
-    <filepath>libCTKCore</filepath>
+  <name>org.commontk.eventbus_0.0.0</name>
+    <filepath>liborg_commontk_eventbus</filepath>
     <interface>
       <name>org.commontk.core.EventBus</name>
       <version>1.0</version>
       <capabilities></capabilities>
+      <customproperty key="objectclass">ctkEventBus</customproperty>
       <description>Interface for the CTK event bus</description>
     </interface>
 </service>