From 8d01d421d49f5d05a3e113cd779d296b50271109 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 20 Oct 2018 11:53:36 -0400 Subject: QML UI: make the QML window object part of the QMLManager class This way we can access it from that code (which we'll need to invoke methods in QML code from C++). Signed-off-by: Dirk Hohndel --- mobile-widgets/qmlmanager.h | 1 + subsurface-helper.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index bd18edefa..a8f67389c 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -136,6 +136,7 @@ public: QStringList cylinderInit() const; Q_INVOKABLE void setStatusbarColor(QColor color); void btHostModeChange(QBluetoothLocalDevice::HostMode state); + QObject *qmlWindow; #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) void writeToAppLogFile(QString logText); diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp index 8e2de1230..fc5d7a62a 100644 --- a/subsurface-helper.cpp +++ b/subsurface-helper.cpp @@ -130,6 +130,7 @@ void run_ui() manager->setDevicePixelRatio(qml_window->devicePixelRatio(), qml_window->screen()); manager->dlSortModel = sortModel; + manager->qmlWindow = qqWindowObject; manager->screenChanged(screen); qDebug() << "qqwindow screen has ldpi/pdpi" << screen->logicalDotsPerInch() << screen->physicalDotsPerInch(); #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) -- cgit v1.2.3-70-g09d2