diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp index c63b9c14..9249d9b0 100644 --- a/nymea-app/main.cpp +++ b/nymea-app/main.cpp @@ -245,7 +245,7 @@ int main(int argc, char *argv[]) application.setWindowIcon(QIcon(QString(":/styles/%1/logo.svg").arg(styleController.currentStyle()))); - engine->load(QUrl(QLatin1String("qrc:/ui/utils/TestMain.qml"))); + engine->load(QUrl(QLatin1String("qrc:/ui/Nymea.qml"))); return application.exec(); } diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc index 0215a567..5160a7d2 100644 --- a/nymea-app/resources.qrc +++ b/nymea-app/resources.qrc @@ -324,6 +324,5 @@ ui/shaders/coloricon.frag.qsb ui/shaders/brightnesscircle.frag.qsb ui/shaders/colorizedimage.frag.qsb - ui/utils/TestMain.qml diff --git a/nymea-app/ui/utils/TestMain.qml b/nymea-app/ui/utils/TestMain.qml deleted file mode 100644 index 4d1f2cee..00000000 --- a/nymea-app/ui/utils/TestMain.qml +++ /dev/null @@ -1,51 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -* -* Copyright 2013 - 2020, nymea GmbH -* Contact: contact@nymea.io -* -* This file is part of nymea. -* This project including source code and documentation is protected by -* copyright law, and remains the property of nymea GmbH. All rights, including -* reproduction, publication, editing and translation, are reserved. The use of -* this project is subject to the terms of a license agreement to be concluded -* with nymea GmbH in accordance with the terms of use of nymea GmbH, available -* under https://nymea.io/license -* -* GNU General Public License Usage -* Alternatively, this project may be redistributed and/or modified under the -* terms of the GNU General Public License as published by the Free Software -* Foundation, GNU version 3. This project is distributed in the hope that it -* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty -* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -* Public License for more details. -* -* You should have received a copy of the GNU General Public License along with -* this project. If not, see . -* -* For any further details and any questions please contact us under -* contact@nymea.io or see our FAQ/Licensing Information on -* https://nymea.io/license/faq -* -* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -import QtQuick.Controls.Material -import QtQuick.Controls -import QtQuick -import QtQuick.Layouts -import QtCore -import Qt.labs.folderlistmodel -import QtQuick.Window - -import Nymea -import NymeaApp.Utils - -ApplicationWindow { - id: app - visible: true - - Label { - anchors.centerIn: parent - text: "Yeah..well" - } - -} diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml index 2335cb1a..4c749ea8 100644 --- a/packaging/android/AndroidManifest.xml +++ b/packaging/android/AndroidManifest.xml @@ -39,7 +39,7 @@ - +