Fixed cmake build

This commit is contained in:
Albert Vaca 2013-06-25 18:43:54 +02:00
parent 3ff7779c7c
commit df12667f10
5 changed files with 6 additions and 6 deletions

View file

@ -15,6 +15,8 @@ set(kded_androidshine_SRCS
networkpackage.cpp
daemon.cpp
device.cpp
${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.xml
)
kde4_add_plugin(kded_androidshine ${kded_androidshine_SRCS})
@ -34,8 +36,6 @@ qt4_generate_dbus_interface(
OPTIONS -a
)
add_dependencies(kded_androidshine ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.xml)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
install(TARGETS kded_androidshine DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES androidshine.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)

View file

@ -5,11 +5,11 @@ set(kcm_SRCS
qt4_add_dbus_interface(
kcm_SRCS
${DBUS_INTERFACES_INSTALL_DIR}/org.kde.kdeconnect.xml
${CMAKE_BINARY_DIR}/daemon/org.kde.kdeconnect.xml
daemoninterface
)
kde4_add_ui_files(kcm_SRCS kcm.ui wizzard.ui)
kde4_add_ui_files(kcm_SRCS kcm.ui wizard.ui)
kde4_add_plugin(kdeconnect-kcm ${kcm_SRCS})

View file

@ -41,7 +41,7 @@ KdeConnectKcm::KdeConnectKcm(QWidget *parent, const QVariantList&)
: KCModule(KdeConnectKcmFactory::componentData(), parent)
, dbusInterface("org.kde.kded", "/modules/androidshine", QDBusConnection::sessionBus(), this)
{
m_ui = new Ui::KdeConnectKcmUi();
m_ui->setupUi(this);

View file

@ -56,7 +56,7 @@ private Q_SLOTS:
void deviceRemoved(QString id);
private:
LocalDaemonInterface dbusInterface;
OrgKdeKdeconnectInterface dbusInterface;
Ui::KdeConnectKcmUi* m_ui;
QStandardItemModel* m_model;