Update for app framework removal

Changes:
- Remove the autobuild scripts and config.xml used by the app
  framework widget build.
- Update the qmake files to just build a "dashboard" binary and
  install it into /usr/bin by default.
- Remove the code in main.cpp that handled reading the WebSocket
  command-line arguments and passing them to binding related
  code.
- Add setenv of QT_QUICK_CONTROLS_STYLE to "AGL" to get the AGL
  styling used.  This replaces a global environment variable
  definition tied to the old app framework, and makes it more
  obvious that the style is required for the app to properly
  work.
- Comment out signal-composer code in Dashboard.qml for now,
  keeping it as an indicator of how the values are updated may
  be useful.  Also remove some leftover screen scaling tweaks
  as minor cleanup.

Bug-AGL: SPEC-4182

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I0ea604cb72aee86990e9584b0cab9577b2cd41e3

4 files changed, 23 insertions, 55 deletions

diff --git a/app/Dashboard.qml b/app/Dashboard.qml
index ef4f8f4..1b61d4c 100644
--- a/app/Dashboard.qml
+++ b/app/Dashboard.qml
@@ -34,7 +34,7 @@ ApplicationWindow {
 
     property double vehicleSpeed: 0
     property double engineSpeed: 0
-
+/*
     Connections {
         target: SignalComposer
 
@@ -52,14 +52,12 @@ ApplicationWindow {
             }
         }
     }
-
+*/
     Item {
         id: container
         anchors.centerIn: parent
         width: Window.width
         height: Window.height
-        //scale: screenInfo.scale_factor()
-        scale: 1
 
     Label {
         id: speed
@@ -271,7 +269,6 @@ ApplicationWindow {
                 text: qsTr(model.language)
                 onClicked: {
                     translator.language = model.code
-                    console.log ("Scale = " + screenInfo.scale_factor())
                 }
             }
         }
diff --git a/app/app.pri b/app/app.pri
deleted file mode 100644
index f22f540..0000000
--- a/app/app.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = app
-
-DESTDIR = $${OUT_PWD}/../package/root/bin
diff --git a/app/app.pro b/app/app.pro
index 7626359..256506d 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -1,24 +1,24 @@
+TEMPLATE = app
 TARGET = dashboard
-QT = quick
+QT = qml quick
+CONFIG += c++11 link_pkgconfig
 
 HEADERS += \
     translator.h
 
-SOURCES = main.cpp \
+SOURCES = \
+    main.cpp \
     translator.cpp
 
-CONFIG += link_pkgconfig
-PKGCONFIG += qtappfw-signal-composer
-
-CONFIG(release, debug|release) {
-    QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET)
-}
-
 RESOURCES += \
     dashboard.qrc \
     images/images.qrc
 
-include(app.pri)
-
 LANGUAGES = ja_JP fr_FR zh_CN ko_KR
 include(translations.pri)
+
+target.path = $${PREFIX}/usr/bin
+target.files += $${OUT_PWD}/$${TARGET}
+target.CONFIG = no_check_exist executable
+
+INSTALLS += target
diff --git a/app/main.cpp b/app/main.cpp
index 6fe44d3..ec7b4a1 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2019 Konsulko Group
+ * Copyright (C) 2019,2021 Konsulko Group
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,47 +16,21 @@
  */
 
 #include <QGuiApplication>
-#include <QtQml/QQmlApplicationEngine>
-#include <QtQml/QQmlContext>
-#include <QtGui/QGuiApplication>
-#include <QtCore/QCommandLineParser>
-#include <QtCore/QUrlQuery>
-#include <signalcomposer.h>
+#include <QQmlApplicationEngine>
+
 #include "translator.h"
 
 int main(int argc, char *argv[])
 {
-    QGuiApplication app(argc, argv);
-    app.setDesktopFileName("dashboard");
-
-    QCommandLineParser parser;
-    parser.addPositionalArgument("port", app.translate("main", "port for binding"));
-    parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
-    parser.addHelpOption();
-    parser.addVersionOption();
-    parser.process(app);
-    QStringList positionalArguments = parser.positionalArguments();
-    if (positionalArguments.length() != 2) {
-        exit(EXIT_FAILURE);
-    }
+	setenv("QT_QUICK_CONTROLS_STYLE", "AGL", 1);
 
-    int port = positionalArguments.takeFirst().toInt();
-    QString secret = positionalArguments.takeFirst();
-    QUrlQuery query;
-    query.addQueryItem(QStringLiteral("token"), secret);
+	QGuiApplication app(argc, argv);
+	app.setDesktopFileName("dashboard");
 
-    QUrl bindingAddress;
-    bindingAddress.setScheme(QStringLiteral("ws"));
-    bindingAddress.setHost(QStringLiteral("localhost"));
-    bindingAddress.setPort(port);
-    bindingAddress.setPath(QStringLiteral("/api"));
-    bindingAddress.setQuery(query);
+	QQmlApplicationEngine engine;
+	qmlRegisterType<Translator>("Translator", 1, 0, "Translator");
+	engine.load(QUrl(QStringLiteral("qrc:/Dashboard.qml")));
 
-    QQmlApplicationEngine engine;
-    QQmlContext *context = engine.rootContext();
-    context->setContextProperty("SignalComposer", new SignalComposer(bindingAddress, context));
-    qmlRegisterType<Translator>("Translator", 1, 0, "Translator");
-    engine.load(QUrl(QStringLiteral("qrc:/Dashboard.qml")));
-    return app.exec();
+	return app.exec();
 }