Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Weixuan Xiao
kdeconnect-kde
Commits
df12667f
Commit
df12667f
authored
Jun 25, 2013
by
Albert Vaca Cintora
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed cmake build
parent
3ff7779c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
daemon/CMakeLists.txt
daemon/CMakeLists.txt
+2
-2
kcm/CMakeLists.txt
kcm/CMakeLists.txt
+2
-2
kcm/kcm.cpp
kcm/kcm.cpp
+1
-1
kcm/kcm.h
kcm/kcm.h
+1
-1
kcm/wizard.ui
kcm/wizard.ui
+0
-0
No files found.
daemon/CMakeLists.txt
View file @
df12667f
...
...
@@ -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
)
...
...
kcm/CMakeLists.txt
View file @
df12667f
...
...
@@ -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 wiz
z
ard.ui
)
kde4_add_ui_files
(
kcm_SRCS kcm.ui wizard.ui
)
kde4_add_plugin
(
kdeconnect-kcm
${
kcm_SRCS
}
)
...
...
kcm/kcm.cpp
View file @
df12667f
...
...
@@ -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
);
...
...
kcm/kcm.h
View file @
df12667f
...
...
@@ -56,7 +56,7 @@ private Q_SLOTS:
void
deviceRemoved
(
QString
id
);
private:
LocalDaemon
Interface
dbusInterface
;
OrgKdeKdeconnect
Interface
dbusInterface
;
Ui
::
KdeConnectKcmUi
*
m_ui
;
QStandardItemModel
*
m_model
;
...
...
kcm/wiz
z
ard.ui
→
kcm/wizard.ui
View file @
df12667f
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment