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

List:       kde-commits
Subject:    [kdev-upload] /: Port kdevupload.desktop to JSON and new QT plugin system
From:       Jakub Caban <kuba () whyblack ! pl>
Date:       2014-10-02 8:54:10
Message-ID: E1XZc9K-0001A6-5o () scm ! kde ! org
[Download RAW message or body]

Git commit 7710e7b98e8b30da8913b3f16411ccc0ee3a3b96 by Jakub Caban.
Committed on 02/10/2014 at 08:53.
Pushed by jcaban into branch 'master'.

Port kdevupload.desktop to JSON and new QT plugin system

REVIEW:120451

M  +3    -4    CMakeLists.txt
M  +1    -1    kdevupload.desktop.cmake
M  +2    -3    kdevuploadplugin.cpp

http://commits.kde.org/kdev-upload/7710e7b98e8b30da8913b3f16411ccc0ee3a3b96

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d73953..c56ded4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,8 @@ add_library(kdevupload_PART_SRCS ${kdevupload_UI})
 
 add_library(kdevupload MODULE ${kdevupload_PART_SRCS})
 
+configure_file(kdevupload.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevupload.desktop)
+kcoreaddons_desktop_to_json(kdevupload ${CMAKE_CURRENT_BINARY_DIR}/kdevupload.desktop)
 
 target_link_libraries(kdevupload
     KDev::Interfaces
@@ -67,15 +69,12 @@ target_link_libraries(kdevupload
     KF5::CoreAddons
 )
 
-install(TARGETS kdevupload  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kdevupload DESTINATION ${PLUGIN_INSTALL_DIR}/kdevplatform/${KDEV_PLUGIN_VERSION})
 
-configure_file(kdevupload.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevupload.desktop)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevupload.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
 install(FILES  kdevupload.rc DESTINATION ${DATA_INSTALL_DIR}/kdevupload)
 
 
 #preferences-plugin
-# add_executable(location_recognition ${SRC} ${UIS_HDRS})
 set(uploadpreferences_PART_SRCS
    uploadpreferences.cpp
    uploadprofilemodel.cpp
diff --git a/kdevupload.desktop.cmake b/kdevupload.desktop.cmake
index 341bedc..719ad59 100644
--- a/kdevupload.desktop.cmake
+++ b/kdevupload.desktop.cmake
@@ -75,7 +75,7 @@ X-KDevelop-Plugin-Copyright=(C) by Niko Sams
 X-KDevelop-Args=
 
 X-KDevelop-Category=Global
-X-KDE-Library=kdevupload
+X-KDE-Library=kdevplatform/@KDEV_PLUGIN_VERSION@/kdevupload
 X-KDE-PluginInfo-Name=KDevUpload
 X-KDevelop-Version=@KDEV_PLUGIN_VERSION@
 X-KDevelop-IRequired=org.kdevelop.IOutputView
diff --git a/kdevuploadplugin.cpp b/kdevuploadplugin.cpp
index 54caa8a..3f05752 100644
--- a/kdevuploadplugin.cpp
+++ b/kdevuploadplugin.cpp
@@ -16,8 +16,7 @@
 #include <QStandardItemModel>
 #include <QItemDelegate>
 
-#include <kpluginfactory.h>
-#include <kpluginloader.h>
+#include <KPluginFactory>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kparts/mainwindow.h>
@@ -46,7 +45,7 @@
 
 #include "version.h"
 
-K_PLUGIN_FACTORY(UploadFactory, registerPlugin<UploadPlugin>(); )
+K_PLUGIN_FACTORY_WITH_JSON(UploadFactory, "kdevupload.json", registerPlugin<UploadPlugin>(); )
 
 class FilesTreeViewFactory: public KDevelop::IToolViewFactory{
   public:
[prev in list] [next in list] [prev in thread] [next in thread]