mirror of
https://github.com/KDE/krfb
synced 2026-07-01 07:41:17 -07:00
Fix merge issues
This commit is contained in:
@@ -45,7 +45,7 @@ public:
|
||||
|
||||
bool isValid() const;
|
||||
|
||||
private slots:
|
||||
private Q_SLOTS:
|
||||
void handleXdpSessionCreated(quint32 code, QVariantMap results);
|
||||
void handleXdpDevicesSelected(quint32 code, QVariantMap results);
|
||||
void handleXdpSourcesSelected(quint32 code, QVariantMap results);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
[Project]
|
||||
CreatedFrom=CMakeLists.txt
|
||||
Manager=KDevCMakeManager
|
||||
Name=krfb
|
||||
|
||||
@@ -84,10 +84,10 @@ qt5_add_dbus_interface(
|
||||
krfb_SRCS
|
||||
dbus/xdp_dbus_remotedesktop_interface.xml
|
||||
dbus/xdp_dbus_remotedesktop_interface
|
||||
)
|
||||
|
||||
qt5_add_resources(krfb_SRCS
|
||||
krfb.qrc
|
||||
|
||||
)
|
||||
|
||||
add_executable (krfb
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <QObject>
|
||||
#include <QRect>
|
||||
#include <QList>
|
||||
#include <QVariant>
|
||||
#include <QWidget>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user