Port, make build and enable KRunnerModel plugin

This commit is contained in:
Sebastian Kügler 2013-02-18 01:15:01 +01:00
parent 6aa3947cd8
commit b15f6baebd
4 changed files with 12 additions and 13 deletions

View File

@ -1,6 +1,6 @@
add_subdirectory(core) add_subdirectory(core)
#add_subdirectory(draganddrop) #add_subdirectory(draganddrop)
#add_subdirectory(krunnermodel) add_subdirectory(krunnermodel)
add_subdirectory(qtextracomponents) add_subdirectory(qtextracomponents)
add_subdirectory(plasmacomponents) add_subdirectory(plasmacomponents)
add_subdirectory(plasmaextracomponents) add_subdirectory(plasmaextracomponents)

View File

@ -7,13 +7,13 @@ set(runnermodel_SRCS
qt4_automoc(${runnermodel_SRCS}) qt4_automoc(${runnermodel_SRCS})
kde4_add_library(runnermodelplugin SHARED ${runnermodel_SRCS}) add_library(runnermodelplugin SHARED ${runnermodel_SRCS})
target_link_libraries(runnermodelplugin target_link_libraries(runnermodelplugin
${QT_QTCORE_LIBRARY} ${Qt5Quick_LIBRARIES}
${QT_QTDECLARATIVE_LIBRARY} ${Qt5Qml_LIBRARIES}
${KDE4_PLASMA_LIBS} 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)

View File

@ -19,7 +19,7 @@
#include "runnermodelplugin.h" #include "runnermodelplugin.h"
#include <QtDeclarative/qdeclarative.h> #include <QtQml>
#include <KDebug> #include <KDebug>

View File

@ -20,19 +20,18 @@
#ifndef RUNNERMODELPLUGIN_H #ifndef RUNNERMODELPLUGIN_H
#define RUNNERMODELPLUGIN_H #define RUNNERMODELPLUGIN_H
#include <QDeclarativeExtensionPlugin> #include <QQmlExtensionPlugin>
/* /*
* FIXME: This plugin is deprecated, it should be removed for plasma2 * FIXME: This plugin is deprecated, it should be removed for plasma2
*/ */
class RunnerModelPlugin : public QDeclarativeExtensionPlugin class RunnerModelPlugin : public QQmlExtensionPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public: public:
void registerTypes(const char *uri); void registerTypes(const char *uri);
}; };
Q_EXPORT_PLUGIN2(datamodelsplugin, RunnerModelPlugin)
#endif #endif