summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@qt.io>2017-12-27 20:27:45 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-12-27 20:13:29 +0000
commit816759c563a8360af421d4eee2c188e5b3792840 (patch)
treeb766f94c96ec1f82274e8e8fdc54cffb6c59d286
parent31aa71161840d08dd8ca04590ef9fbcc40a8efeb (diff)
Apply QtQuickControls2 style from platform
AGL now set its own style through an environment variable. App doesn't need to take care of it any more. Change-Id: Id0d43e7c05328ed5fef0e3cca7c1ddac78e69b3d Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
-rw-r--r--app/app.pro2
-rw-r--r--app/main.cpp3
2 files changed, 1 insertions, 4 deletions
diff --git a/app/app.pro b/app/app.pro
index 00c9c55..6cd3ead 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -1,5 +1,5 @@
TARGET = hvac
-QT = quickcontrols2 qml
+QT = quick qml
SOURCES = main.cpp
diff --git a/app/main.cpp b/app/main.cpp
index 57c731e..574e9a5 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -20,7 +20,6 @@
#include <QtGui/QGuiApplication>
#include <QtQml/QQmlApplicationEngine>
#include <QtQml/QQmlContext>
-#include <QtQuickControls2/QQuickStyle>
#include <QQuickWindow>
#include <libhomescreen.hpp>
#include <qlibwindowmanager.h>
@@ -34,8 +33,6 @@ int main(int argc, char *argv[])
app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
- QQuickStyle::setStyle("AGL");
-
QCommandLineParser parser;
parser.addPositionalArgument("port", app.translate("main", "port for binding"));
parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));