diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2020-01-22 01:18:44 +0200 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2020-01-22 20:25:47 +0200 |
| commit | 2afae8c55678cf070ee1a41137be48019ea4872c (patch) | |
| tree | 2db169a414592d92e9806331cf8573c87349fd71 | |
| parent | 3a06bfdba8bc3e521d23c59e4c8e12101df175ce (diff) | |
app/: Avoid any AGL wrappers and use plain Qt
Removes homescreen/windowmanger requirements from config
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I99a2221e44d04a06b8d3cf412b22e0204a9c89a5
| -rw-r--r-- | app/app.pro | 7 | ||||
| -rw-r--r-- | app/main.cpp | 55 | ||||
| -rw-r--r-- | package/config.xml | 2 |
3 files changed, 53 insertions, 11 deletions
diff --git a/app/app.pro b/app/app.pro index ef4de97..d10f9c0 100644 --- a/app/app.pro +++ b/app/app.pro @@ -1,5 +1,10 @@ TARGET = hvac -QT = quick qml aglextras +QT = quick qml websockets + +CONFIG += c++11 link_pkgconfig +PKGCONFIG += qtappfw afb-helpers-qt + +#aglextras HEADERS += \ translator.h diff --git a/app/main.cpp b/app/main.cpp index 2fac9ae..6fe54a5 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -14,18 +14,57 @@ * limitations under the License. */ -#include <QtAGLExtras/AGLApplication> +#include <QtGui/QGuiApplication> +#include <QDebug> +#include <QUrlQuery> +#include <QCommandLineParser> #include <QtQml/QQmlApplicationEngine> +#include <QtQml/QQmlContext> #include "translator.h" int main(int argc, char *argv[]) { - AGLApplication app(argc, argv); - app.setApplicationName("HVAC"); - app.setupApplicationRole("hvac"); - qmlRegisterType<Translator>("Translator", 1, 0, "Translator"); - app.load(QUrl(QStringLiteral("qrc:/HVAC.qml"))); - return app.exec(); -} + setenv("QT_QPA_PLATFORM", "wayland", 1); + int port; + QString token; + + QCommandLineParser parser; + QGuiApplication app(argc, argv); + + 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) { + port = positionalArguments.takeFirst().toInt(); + token = positionalArguments.takeFirst(); + qInfo() << "setting port:" << port << ", token:" << token; + } else { + qInfo() << "Need to specify port and token"; + exit(EXIT_FAILURE); + } + QUrl bindingAddress; + bindingAddress.setScheme(QStringLiteral("ws")); + bindingAddress.setHost(QStringLiteral("localhost")); + bindingAddress.setPort(port); + bindingAddress.setPath(QStringLiteral("/api")); + + QUrlQuery query; + query.addQueryItem(QStringLiteral("token"), token); + bindingAddress.setQuery(query); + + QQmlApplicationEngine engine; + engine.rootContext()->setContextProperty("bindingAddress", bindingAddress); + qmlRegisterType<Translator>("Translator", 1, 0, "Translator"); + engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml"))); + + return app.exec(); +} diff --git a/package/config.xml b/package/config.xml index cd4dbbd..c830521 100644 --- a/package/config.xml +++ b/package/config.xml @@ -7,8 +7,6 @@ <author>Romain Forlot <romain.forlot@iot.bzh></author> <license>APL 2.0</license> <feature name="urn:AGL:widget:required-api"> - <param name="windowmanager" value="ws" /> - <param name="homescreen" value="ws" /> <param name="identity" value="ws" /> <param name="HVAC" value="ws" /> </feature> |