tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation after merge

Browse source
This commit is contained in:
Aleix Pol 2014-07-02 01:39:38 +02:00
parent a303b73238
commit a8fb015a22
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cli/kdeconnect-cli.cpp
View file

@ -22,7 +22,6 @@
#include <KUrl>
#include <kcmdlineargs.h>
#include <k4aboutdata.h>
#include <kaboutdata.h>
#include <interfaces/devicesmodel.h>
#include <interfaces/notificationsmodel.h>
#include <interfaces/dbusinterfaces.h>
@ -32,8 +31,8 @@
int main(int argc, char** argv)
{
KAboutData about("kdeconnect-cli", "kdeconnect-cli", ki18n(("kdeconnect-cli")), "1.0", ki18n("KDE Connect CLI tool"),
KAboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez"));
K4AboutData about("kdeconnect-cli", "kdeconnect-cli", ki18n(("kdeconnect-cli")), "1.0", ki18n("KDE Connect CLI tool"),
K4AboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez"));
about.addAuthor( ki18n("Aleix Pol Gonzalez"), KLocalizedString(), "aleixpol@kde.org" );
KCmdLineArgs::init(argc, argv, &about);

2
core/CMakeLists.txt
View file

@ -36,6 +36,8 @@ target_link_libraries(kdeconnectcore
PUBLIC
KF5::KDELibs4Support
PRIVATE
${QCA2_LIBRARIES}
${QJSON_LIBRARIES}
KF5::KIOWidgets
KF5::KCMUtils
Qt5::Network

3
plugins/mousepad/mousepadplugin.cpp
View file

@ -20,7 +20,6 @@
#include "mousepadplugin.h"
#include <core/networkpackage.h>
#include <X11/extensions/XTest.h>
K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< MousepadPlugin >(); )
@ -90,3 +89,5 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np)
}
return true;
}
#include "mousepadplugin.moc"

6
plugins/mousepad/mousepadplugin.h
View file

@ -21,10 +21,9 @@
#ifndef MOUSEPADPLUGIN_H
#define MOUSEPADPLUGIN_H
#include <QObject>
#include <QApplication>
#include <QtGui/QCursor>
#include <core/kdeconnectplugin.h>
#include <X11/Xlib.h>
#define PACKAGE_TYPE_MOUSEPAD QLatin1String("kdeconnect.mousepad")
@ -45,7 +44,6 @@ public:
explicit MousepadPlugin(QObject *parent, const QVariantList &args);
virtual ~MousepadPlugin();
public Q_SLOTS:
virtual bool receivePackage(const NetworkPackage& np);
virtual void connected() { }