diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-20 11:53:36 -0400 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-23 22:45:30 +0100 |
| commit | 8d01d421d49f5d05a3e113cd779d296b50271109 (patch) | |
| tree | 39be143700bc31c62f36458891a4f152997b7c7d | |
| parent | 16e91177bbd4c8dfd0a2c798d5de9d9490e86256 (diff) | |
| download | subsurface-8d01d421d49f5d05a3e113cd779d296b50271109.tar.gz | |
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 <dirk@hohndel.org>
| -rw-r--r-- | mobile-widgets/qmlmanager.h | 1 | ||||
| -rw-r--r-- | subsurface-helper.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
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) |