aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2016-12-08 15:04:33 +0000
committerRomain Forlot <romain.forlot@iot.bzh>2016-12-08 15:27:58 +0000
commit67891d05ffc7ba9b1d67dc066d34dea63610686b (patch)
treee1d2237b80839b4b180201225b9caaf75ff01986 /app
parentcad28501e516d164a2aa3753fec5c44368b31c72 (diff)
Fix: use a virtual can device vcan0
Change-Id: I6724edb37152c8cc7f1d7a550e59ae0a8b3aeb17 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'app')
-rw-r--r--app/hvac-demo-ui.cpp46
-rw-r--r--app/hvac-demo.pro (renamed from app/HVAC.pro)0
2 files changed, 0 insertions, 46 deletions
diff --git a/app/hvac-demo-ui.cpp b/app/hvac-demo-ui.cpp
deleted file mode 100644
index c00c43b..0000000
--- a/app/hvac-demo-ui.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QtCore/QDebug>
-#include <QtGui/QGuiApplication>
-#include <QtQml/QQmlApplicationEngine>
-#include <QtQuickControls2/QQuickStyle>
-
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
-
-int main(int argc, char *argv[])
-{
-#ifdef HAVE_LIBHOMESCREEN
- LibHomeScreen libHomeScreen;
-
- if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) {
- qWarning() << "renderAppToAreaAllowed is denied";
- return -1;
- }
-#endif
-
- QGuiApplication app(argc, argv);
-
- QQuickStyle::setStyle("AGL");
-
- QQmlApplicationEngine engine;
- engine.load(QUrl(QStringLiteral("qrc:/hvac-demo.qml")));
-
- return app.exec();
-}
-
diff --git a/app/HVAC.pro b/app/hvac-demo.pro
index 7213f37..7213f37 100644
--- a/app/HVAC.pro
+++ b/app/hvac-demo.pro