From b15f6baebd72a07133995cbb663c83aca691a863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas@kde.org>
Date: Mon, 18 Feb 2013 01:15:01 +0100
Subject: [PATCH] Port, make build and enable KRunnerModel plugin

---
 src/declarativeimports/CMakeLists.txt              |  2 +-
 src/declarativeimports/krunnermodel/CMakeLists.txt | 14 +++++++-------
 .../krunnermodel/runnermodelplugin.cpp             |  2 +-
 .../krunnermodel/runnermodelplugin.h               |  7 +++----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/declarativeimports/CMakeLists.txt b/src/declarativeimports/CMakeLists.txt
index 99f8d5f42..a9527b92c 100644
--- a/src/declarativeimports/CMakeLists.txt
+++ b/src/declarativeimports/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(core)
 #add_subdirectory(draganddrop)
-#add_subdirectory(krunnermodel)
+add_subdirectory(krunnermodel)
 add_subdirectory(qtextracomponents)
 add_subdirectory(plasmacomponents)
 add_subdirectory(plasmaextracomponents)
diff --git a/src/declarativeimports/krunnermodel/CMakeLists.txt b/src/declarativeimports/krunnermodel/CMakeLists.txt
index 4f53955c7..113e7df5b 100644
--- a/src/declarativeimports/krunnermodel/CMakeLists.txt
+++ b/src/declarativeimports/krunnermodel/CMakeLists.txt
@@ -7,13 +7,13 @@ set(runnermodel_SRCS
 
 qt4_automoc(${runnermodel_SRCS})
 
-kde4_add_library(runnermodelplugin SHARED ${runnermodel_SRCS})
+add_library(runnermodelplugin SHARED ${runnermodel_SRCS})
 target_link_libraries(runnermodelplugin
-        ${QT_QTCORE_LIBRARY}
-        ${QT_QTDECLARATIVE_LIBRARY}
-        ${KDE4_PLASMA_LIBS}
-        )
+        ${Qt5Quick_LIBRARIES}
+        ${Qt5Qml_LIBRARIES}
+        plasma)
 
-install(TARGETS runnermodelplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/runnermodel)
-install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/runnermodel)
+
+install(TARGETS runnermodelplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/runnermodel)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/runnermodel)
 
diff --git a/src/declarativeimports/krunnermodel/runnermodelplugin.cpp b/src/declarativeimports/krunnermodel/runnermodelplugin.cpp
index 38a6c91ed..d015bf5d2 100644
--- a/src/declarativeimports/krunnermodel/runnermodelplugin.cpp
+++ b/src/declarativeimports/krunnermodel/runnermodelplugin.cpp
@@ -19,7 +19,7 @@
 
 #include "runnermodelplugin.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml>
 
 #include <KDebug>
 
diff --git a/src/declarativeimports/krunnermodel/runnermodelplugin.h b/src/declarativeimports/krunnermodel/runnermodelplugin.h
index 2f92a7e0d..65d2faabe 100644
--- a/src/declarativeimports/krunnermodel/runnermodelplugin.h
+++ b/src/declarativeimports/krunnermodel/runnermodelplugin.h
@@ -20,19 +20,18 @@
 #ifndef RUNNERMODELPLUGIN_H
 #define RUNNERMODELPLUGIN_H
 
-#include <QDeclarativeExtensionPlugin>
+#include <QQmlExtensionPlugin>
 
 /*
  * FIXME: This plugin is deprecated, it should be removed for plasma2
  */
-class RunnerModelPlugin : public QDeclarativeExtensionPlugin
+class RunnerModelPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     void registerTypes(const char *uri);
 };
 
-Q_EXPORT_PLUGIN2(datamodelsplugin, RunnerModelPlugin)
-
 #endif