diff options
author | sebastien baudouin <sebastien.baudouin@windriver.com> | 2015-04-28 16:54:26 +0200 |
---|---|---|
committer | James Thomas <james.thomas@codethink.co.uk> | 2015-05-11 12:19:28 +0000 |
commit | bd34e66ab82e6766713c29054436d0f001f22372 (patch) | |
tree | 2dc942423e696ef447385f93cc78b29f881230d4 | |
parent | 2025c5e329a50fdc5614a41562524ce997e46265 (diff) | |
download | genivi-demo-platform-hmi-bd34e66ab82e6766713c29054436d0f001f22372.tar.gz |
Launcher2: Make Graphic working on Qemu machine
Those modifications are in theory not needed but unfortunately without it the
graphic is not working.
-rwxr-xr-x | app/gdp-hmi-launcher2/content/ContentModel.qml | 2 | ||||
-rwxr-xr-x | app/gdp-hmi-launcher2/content/ListItem.qml | 2 | ||||
-rwxr-xr-x | app/gdp-hmi-launcher2/content/NMapEffect.qml | 2 | ||||
-rwxr-xr-x | app/gdp-hmi-launcher2/content/NMapLightSource.qml | 2 | ||||
-rwxr-xr-x | app/gdp-hmi-launcher2/content/PowerOffItem.qml | 2 | ||||
-rwxr-xr-x | app/gdp-hmi-launcher2/gdp-hmi-launcher2.qml | 2 | ||||
-rwxr-xr-x | app/gdp-hmi-launcher2/main.cpp | 12 |
7 files changed, 18 insertions, 6 deletions
diff --git a/app/gdp-hmi-launcher2/content/ContentModel.qml b/app/gdp-hmi-launcher2/content/ContentModel.qml index 04a895e..6680509 100755 --- a/app/gdp-hmi-launcher2/content/ContentModel.qml +++ b/app/gdp-hmi-launcher2/content/ContentModel.qml @@ -14,7 +14,7 @@ * launching application * */ -import QtQuick 2.0 +import QtQuick 2.1 ListModel { ListElement { diff --git a/app/gdp-hmi-launcher2/content/ListItem.qml b/app/gdp-hmi-launcher2/content/ListItem.qml index 4dcc978..2ff531e 100755 --- a/app/gdp-hmi-launcher2/content/ListItem.qml +++ b/app/gdp-hmi-launcher2/content/ListItem.qml @@ -13,7 +13,7 @@ * associated to the selected item * */ -import QtQuick 2.0 +import QtQuick 2.1 Item { id: root diff --git a/app/gdp-hmi-launcher2/content/NMapEffect.qml b/app/gdp-hmi-launcher2/content/NMapEffect.qml index 05694e6..e7fbf06 100755 --- a/app/gdp-hmi-launcher2/content/NMapEffect.qml +++ b/app/gdp-hmi-launcher2/content/NMapEffect.qml @@ -11,7 +11,7 @@ * List of changes: * */ -import QtQuick 2.0 +import QtQuick 2.1 /* Simple normal mapping shader */ diff --git a/app/gdp-hmi-launcher2/content/NMapLightSource.qml b/app/gdp-hmi-launcher2/content/NMapLightSource.qml index b0c787f..5b46ba4 100755 --- a/app/gdp-hmi-launcher2/content/NMapLightSource.qml +++ b/app/gdp-hmi-launcher2/content/NMapLightSource.qml @@ -11,7 +11,7 @@ * List of changes: * */ -import QtQuick 2.0 +import QtQuick 2.1 /* Light source for the normal mapping shader */ diff --git a/app/gdp-hmi-launcher2/content/PowerOffItem.qml b/app/gdp-hmi-launcher2/content/PowerOffItem.qml index ea198e4..45b5025 100755 --- a/app/gdp-hmi-launcher2/content/PowerOffItem.qml +++ b/app/gdp-hmi-launcher2/content/PowerOffItem.qml @@ -15,7 +15,7 @@ * 16.Mar.2015, Sebastien Baudouin, written based on template created by QtCreator * */ -import QtQuick 2.0 +import QtQuick 2.1 Item { id: root diff --git a/app/gdp-hmi-launcher2/gdp-hmi-launcher2.qml b/app/gdp-hmi-launcher2/gdp-hmi-launcher2.qml index f9a58af..aeb446b 100755 --- a/app/gdp-hmi-launcher2/gdp-hmi-launcher2.qml +++ b/app/gdp-hmi-launcher2/gdp-hmi-launcher2.qml @@ -14,7 +14,7 @@ * stored and add a new item for powerOff * */ -import QtQuick 2.0 +import QtQuick 2.1 import QtGraphicalEffects 1.0 import "content" diff --git a/app/gdp-hmi-launcher2/main.cpp b/app/gdp-hmi-launcher2/main.cpp index 8a399bd..7961ad3 100755 --- a/app/gdp-hmi-launcher2/main.cpp +++ b/app/gdp-hmi-launcher2/main.cpp @@ -19,6 +19,12 @@ #include <QtDBus> #include <QQmlContext> +//For QEMU +#include <QScreen> +#include <QQuickWindow> +#include <QQuickItem> + + #ifdef USE_DLT #include <dlt/dlt.h> DLT_DECLARE_CONTEXT(launcherTraceCtx); @@ -73,6 +79,12 @@ int main(int argc, char* argv[]) //let's show the view view.showFullScreen(); + //For QEMU + QSize size = app.primaryScreen()->size(); + view.rootObject()->setWidth(size.width()); + view.rootObject()->setHeight(size.height()); + view.show(); + //let's start the App ret = app.exec(); |