aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>2019-05-30 18:54:12 +0900
committerzheng_wenlong <wenlong_zheng@nexty-ele.com>2019-05-30 18:54:12 +0900
commitd94ae428a28a6a1dcb4c8e87ac6dbf32eb440f02 (patch)
tree6b980ab08bd28e58c4177ff3ec4bfa43d8ee2116
parenta01dcdae19a645ccb2924d7c1003f4186696b48e (diff)
change libhomscreen to qlibhomescreen
-rw-r--r--app/app.pri6
-rw-r--r--app/config.tests/libhomescreen/libhomescreen.cpp8
-rw-r--r--app/config.tests/libhomescreen/libhomescreen.pro5
-rw-r--r--app/config.tests/qlibhomescreen/.qmake.stash (renamed from app/config.tests/libhomescreen/.qmake.stash)0
-rw-r--r--app/config.tests/qlibhomescreen/qlibhomescreen.cpp8
-rw-r--r--app/config.tests/qlibhomescreen/qlibhomescreen.pro6
-rw-r--r--app/main.cpp6
7 files changed, 20 insertions, 19 deletions
diff --git a/app/app.pri b/app/app.pri
index 3bd7b93..8e98c34 100644
--- a/app/app.pri
+++ b/app/app.pri
@@ -1,12 +1,12 @@
load(configure)
-qtCompileTest(libhomescreen)
+qtCompileTest(qlibhomescreen)
qtCompileTest(qlibwindowmanager)
-config_libhomescreen {
+config_qlibhomescreen {
CONFIG += link_pkgconfig
PKGCONFIG += qlibhomescreen
- DEFINES += HAVE_LIBHOMESCREEN
+ DEFINES += HAVE_QLIBHOMESCREEN
}
config_qlibwindowmanager {
diff --git a/app/config.tests/libhomescreen/libhomescreen.cpp b/app/config.tests/libhomescreen/libhomescreen.cpp
deleted file mode 100644
index d698b05..0000000
--- a/app/config.tests/libhomescreen/libhomescreen.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <libhomescreen.hpp>
-
-int main(int argc,char **argv)
-{
- LibHomeScreen libHomeScreen;
- return 0;
-}
-
diff --git a/app/config.tests/libhomescreen/libhomescreen.pro b/app/config.tests/libhomescreen/libhomescreen.pro
deleted file mode 100644
index 7d43112..0000000
--- a/app/config.tests/libhomescreen/libhomescreen.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = libhomescreen.cpp
-
-CONFIG -= qt
-CONFIG += link_pkgconfig
-PKGCONFIG += libhomescreen
diff --git a/app/config.tests/libhomescreen/.qmake.stash b/app/config.tests/qlibhomescreen/.qmake.stash
index d0807e7..d0807e7 100644
--- a/app/config.tests/libhomescreen/.qmake.stash
+++ b/app/config.tests/qlibhomescreen/.qmake.stash
diff --git a/app/config.tests/qlibhomescreen/qlibhomescreen.cpp b/app/config.tests/qlibhomescreen/qlibhomescreen.cpp
new file mode 100644
index 0000000..8e49ff7
--- /dev/null
+++ b/app/config.tests/qlibhomescreen/qlibhomescreen.cpp
@@ -0,0 +1,8 @@
+#include <qlibhomescreen.h>
+
+int main(int argc,char **argv)
+{
+ QLibHomeScreen qlibHomeScreen;
+ return 0;
+}
+
diff --git a/app/config.tests/qlibhomescreen/qlibhomescreen.pro b/app/config.tests/qlibhomescreen/qlibhomescreen.pro
new file mode 100644
index 0000000..a5e6fde
--- /dev/null
+++ b/app/config.tests/qlibhomescreen/qlibhomescreen.pro
@@ -0,0 +1,6 @@
+SOURCES = qlibhomescreen.cpp
+
+CONFIG += qt
+QT += quick
+CONFIG += link_pkgconfig
+PKGCONFIG += qlibhomescreen
diff --git a/app/main.cpp b/app/main.cpp
index 05eaf31..81d8c5f 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -12,7 +12,7 @@
#include "dbus_client.h"
#include "file_operation.h"
-#ifdef HAVE_LIBHOMESCREEN
+#ifdef HAVE_QLIBHOMESCREEN
#include <qlibhomescreen.h>
#endif
#ifdef HAVE_QLIBWINDOWMANAGER
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
}
#endif
-#ifdef HAVE_LIBHOMESCREEN
+#ifdef HAVE_QLIBHOMESCREEN
// HomeScreen
QLibHomeScreen* qhs = new QLibHomeScreen();
std::string token = secret.toStdString();
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
QObject *root = engine.rootObjects().first();
QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-#ifdef HAVE_LIBHOMESCREEN
+#ifdef HAVE_QLIBHOMESCREEN
qhs->setQuickWindow(window);
#endif
//make the DBus connection info