diff --git a/src/data/contents/ui/BaseApp.qml b/src/data/contents/ui/BaseApp.qml --- a/src/data/contents/ui/BaseApp.qml +++ b/src/data/contents/ui/BaseApp.qml @@ -212,6 +212,10 @@ } } + contextDrawer: Kirigami.ContextDrawer { + id: contextDrawer + } + pageStack.initialPage: mainPageComponent Component { diff --git a/src/data/contents/ui/mobileApp.qml b/src/data/contents/ui/mobileApp.qml deleted file mode 100644 --- a/src/data/contents/ui/mobileApp.qml +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2015 Marco Martin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 or - * (at your option) any later version. - * - * This program 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 Library General Public License for more details - * - * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -import QtQuick 2.1 -import QtQuick.Controls 2.0 as Controls -import QtQuick.Layouts 1.2 -import org.kde.kirigami 2.4 as Kirigami -import "gallery" - -BaseApp { - id: root - - contextDrawer: Kirigami.ContextDrawer { - id: contextDrawer - } -} diff --git a/src/main.cpp b/src/main.cpp --- a/src/main.cpp +++ b/src/main.cpp @@ -57,15 +57,7 @@ qmlRegisterType("Data", 1, 0, "InfoData"); - //we want different main files on desktop or mobile - //very small difference as they as they are subclasses of the same thing - if (qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_MOBILE") && - (QString::fromLatin1(qgetenv("QT_QUICK_CONTROLS_MOBILE")) == QStringLiteral("1") || - QString::fromLatin1(qgetenv("QT_QUICK_CONTROLS_MOBILE")) == QStringLiteral("true"))) { - engine.load(QUrl(QStringLiteral("qrc:///contents/ui/mobileApp.qml"))); - } else { - engine.load(QUrl(QStringLiteral("qrc:///contents/ui/BaseApp.qml"))); - } + engine.load(QUrl(QStringLiteral("qrc:///contents/ui/BaseApp.qml"))); if (engine.rootObjects().isEmpty()) { return -1; diff --git a/src/resources.qrc b/src/resources.qrc --- a/src/resources.qrc +++ b/src/resources.qrc @@ -26,7 +26,6 @@ ./data/contents/ui/gallery/FormLayoutGallery.qml ./data/contents/ui/gallery/ColorSetGallery.qml ./data/contents/ui/BaseApp.qml - ./data/contents/ui/mobileApp.qml ./data/metadata.desktop qtquickcontrols2.conf ./data/info-data.json