From fa3221e2b26b29d09f5195cb79c9dbd6fa519199 Mon Sep 17 00:00:00 2001 From: SeeLook <945374+SeeLook@users.noreply.github.com> Date: Sat, 1 Apr 2017 21:16:53 +0200 Subject: [PATCH] Trying Material for mobile. --- src/main.cpp | 4 +++- src/nootka.qrc | 4 ++++ src/qml/MainWindow.qml | 8 ++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 5b4e6cee5..6ee1f7aba 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -62,6 +62,8 @@ bool resetConfig; int main(int argc, char *argv[]) { + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + #if defined (Q_OS_ANDROID) qputenv("QT_ANDROID_VOLUME_KEYS", "1"); // Handle volume keys by Qt, lock native Android behavior @@ -69,7 +71,7 @@ int main(int argc, char *argv[]) logFile = Tandroid::getExternalPath() + QStringLiteral("/nootka-log.txt"); if (QFile::exists(logFile)) QFile::remove(logFile); - qInstallMessageHandler(myMessageOutput); + qInstallMessageHandler(myMessageOutput); qDebug() << "==== NOOTKA LOG =======\n" << QDateTime::currentDateTime().toString(); #endif diff --git a/src/nootka.qrc b/src/nootka.qrc index 593fad678..ec61afd57 100644 --- a/src/nootka.qrc +++ b/src/nootka.qrc @@ -3,6 +3,7 @@ <file alias="MainWindow.qml">qml/MainWindow.qml</file> <file alias="MainMenu.qml">qml/MainMenu.qml</file> <file alias="+android/MainMenu.qml">qml/+android/MainMenuMobile.qml</file> +<!-- <file alias="+linux/MainMenu.qml">qml/+android/MainMenuMobile.qml</file> --> <file alias="TtoolBar.qml">qml/TtoolBar.qml</file> <file alias="NootkaLabel.qml">qml/NootkaLabel.qml</file> <file alias="MainScore.qml">qml/MainScore.qml</file> @@ -48,5 +49,8 @@ <file alias="fakeTrans.js">qml/shared/fakeTrans.js</file> + <file alias="qtquickcontrols2.conf">qml/qtquickcontrols2.conf</file> + <file alias="+android/qtquickcontrols2.conf">qml/+android/qtquickcontrols2.conf</file> + </qresource> </RCC> diff --git a/src/qml/MainWindow.qml b/src/qml/MainWindow.qml index fa15bcf00..4bdfe4bcd 100644 --- a/src/qml/MainWindow.qml +++ b/src/qml/MainWindow.qml @@ -118,8 +118,12 @@ ApplicationWindow { DialogLoader { id: dialogLoader } -// Component.onCompleted: { -// } + Component.onCompleted: { + randNotes() + randNotes() + randNotes() + randNotes() + } // Timer { // interval: 5000 -- GitLab