summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-01-07 16:17:50 -0500
committerScott Murray <scott.murray@konsulko.com>2021-01-07 16:26:44 -0500
commit32596d1152e7a94bc62734dc222a3d99c14e1fe5 (patch)
tree75fe12fb4458934c0c4673dfe8598d2f146ad490 /app
parent2f34905d9b4b1aa78d4a38dd8605ff192e46b245 (diff)
qlibhomescreen was still a dependency in the qmake files, and its header file was being pulled in in main.cpp even though there it is no longer used, remove usage. Also remove leftover libhomescreen and qlibwindowmanager related files, now unused homescreen binding dependency in config.xml manifest, and long unused QT websockets module dependency. Bug-AGL: SPEC-3757 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I7b8de507f785e1850caae4e91cd9033c0ced468b
Diffstat (limited to 'app')
-rw-r--r--app/app.pro4
-rw-r--r--app/config.tests/libhomescreen/.qmake.stash24
-rw-r--r--app/config.tests/libhomescreen/libhomescreen.cpp8
-rw-r--r--app/config.tests/libhomescreen/libhomescreen.pro5
-rw-r--r--app/config.tests/qlibwindowmanager/.qmake.stash24
-rw-r--r--app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp8
-rw-r--r--app/config.tests/qlibwindowmanager/qlibwindowmanager.pro5
-rw-r--r--app/main.cpp1
8 files changed, 2 insertions, 77 deletions
diff --git a/app/app.pro b/app/app.pro
index c04b838..fbe53a4 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -1,8 +1,8 @@
TARGET = tbtnavi
TEMPLATE = app
-QT = qml network quick positioning location widgets websockets gui-private
-PKGCONFIG += qlibhomescreen qtappfw-navigation qtappfw-signal-composer wayland-client
+QT = qml network quick positioning location widgets gui-private
+PKGCONFIG += qtappfw-navigation qtappfw-signal-composer wayland-client
CONFIG += c++1z link_pkgconfig wayland-scanner
diff --git a/app/config.tests/libhomescreen/.qmake.stash b/app/config.tests/libhomescreen/.qmake.stash
deleted file mode 100644
index d0807e7..0000000
--- a/app/config.tests/libhomescreen/.qmake.stash
+++ /dev/null
@@ -1,24 +0,0 @@
-QMAKE_CXX.INCDIRS = \
- /usr/include/c++/5 \
- /usr/include/x86_64-linux-gnu/c++/5 \
- /usr/include/c++/5/backward \
- /usr/lib/gcc/x86_64-linux-gnu/5/include \
- /usr/local/include \
- /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed \
- /usr/include/x86_64-linux-gnu \
- /usr/include
-QMAKE_CXX.LIBDIRS = \
- /usr/lib/gcc/x86_64-linux-gnu/5 \
- /usr/lib/x86_64-linux-gnu \
- /usr/lib \
- /lib/x86_64-linux-gnu \
- /lib
-QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
-QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 5
-QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 4
-QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
-QMAKE_CXX.COMPILER_MACROS = \
- QT_COMPILER_STDCXX \
- QMAKE_GCC_MAJOR_VERSION \
- QMAKE_GCC_MINOR_VERSION \
- QMAKE_GCC_PATCH_VERSION
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/qlibwindowmanager/.qmake.stash b/app/config.tests/qlibwindowmanager/.qmake.stash
deleted file mode 100644
index d0807e7..0000000
--- a/app/config.tests/qlibwindowmanager/.qmake.stash
+++ /dev/null
@@ -1,24 +0,0 @@
-QMAKE_CXX.INCDIRS = \
- /usr/include/c++/5 \
- /usr/include/x86_64-linux-gnu/c++/5 \
- /usr/include/c++/5/backward \
- /usr/lib/gcc/x86_64-linux-gnu/5/include \
- /usr/local/include \
- /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed \
- /usr/include/x86_64-linux-gnu \
- /usr/include
-QMAKE_CXX.LIBDIRS = \
- /usr/lib/gcc/x86_64-linux-gnu/5 \
- /usr/lib/x86_64-linux-gnu \
- /usr/lib \
- /lib/x86_64-linux-gnu \
- /lib
-QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
-QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 5
-QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 4
-QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
-QMAKE_CXX.COMPILER_MACROS = \
- QT_COMPILER_STDCXX \
- QMAKE_GCC_MAJOR_VERSION \
- QMAKE_GCC_MINOR_VERSION \
- QMAKE_GCC_PATCH_VERSION
diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp b/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp
deleted file mode 100644
index bb95c93..0000000
--- a/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <qlibwindowmanager.h>
-
-int main(int argc,char **argv)
-{
- QLibWindowmanager qwm;
- return 0;
-}
-
diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro b/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
deleted file mode 100644
index cb51d98..0000000
--- a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = qlibwindowmanager.cpp
-
-CONFIG += qt
-CONFIG += link_pkgconfig
-PKGCONFIG += qlibwindowmanager
diff --git a/app/main.cpp b/app/main.cpp
index fc097f0..645d2f7 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -7,7 +7,6 @@
#include <QtQml/QQmlApplicationEngine>
#include <QtQml/QQmlContext>
#include <QtQuick/QQuickWindow>
-#include <qlibhomescreen.h>
#include <navigation.h>
#include <signalcomposer.h>
#include <QScreen>