diff options
| author |   Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2018-12-16 18:42:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-12-16 18:42:44 +0000 |
| commit | 462a0cae26a82da76004b0176aa5f2ff02b3bba0 (patch) | |
| tree | d5e358c0c76fa659abbf6973e440cc457d80d907 | |
| parent | c0d77c2df7d0ee258bd4c2093ee4a12dbaac3cf4 (diff) | |
| parent | 26d3b8a6775ced4c8187ddb805acf4b8b94606a6 (diff) | |
Merge "Exposed QMLApplicationEngine from AGLApplication"guppy_6.99.3guppy/6.99.36.99.3
| -rw-r--r-- | src/aglextras/hmi/aglapplication.cpp | 5 | ||||
| -rw-r--r-- | src/aglextras/hmi/aglapplication.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/aglextras/hmi/aglapplication.cpp b/src/aglextras/hmi/aglapplication.cpp index cd7eb38..112e110 100644 --- a/src/aglextras/hmi/aglapplication.cpp +++ b/src/aglextras/hmi/aglapplication.cpp @@ -94,6 +94,11 @@ AGLApplication::load (const QString &filePath) d->engine->load(filePath); } +QQmlApplicationEngine* +AGLApplication::getQmlApplicationEngine() const { + return d_ptr->engine; +} + int AGLApplication::exec (void) { diff --git a/src/aglextras/hmi/aglapplication.h b/src/aglextras/hmi/aglapplication.h index babf4de..fbc031c 100644 --- a/src/aglextras/hmi/aglapplication.h +++ b/src/aglextras/hmi/aglapplication.h @@ -19,10 +19,13 @@ #define AGLAPPLICATION_H #include <QtAGLExtras/aglextrasglobal.h> + #include <QSharedPointer> #include <QtGui/QGuiApplication> +class QQmlApplicationEngine; + QT_BEGIN_NAMESPACE class AGLApplicationPrivate; class AGLEXTRAS_EXPORT AGLApplication : public QGuiApplication @@ -37,6 +40,8 @@ public: void load (const QUrl &url); void load (const QString &filePath); + QQmlApplicationEngine* getQmlApplicationEngine() const; + int exec (void); private: |