diff options
Diffstat (limited to 'basicsuite')
| -rw-r--r-- | basicsuite/demos.xml | 6 | ||||
| -rw-r--r-- | basicsuite/ebike-ui/StatsPage.qml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/basicsuite/demos.xml b/basicsuite/demos.xml index 0f84ed8..e521014 100644 --- a/basicsuite/demos.xml +++ b/basicsuite/demos.xml @@ -93,7 +93,7 @@ Qt for Device Creation comes with Qt Virtual Keyboard - a framework that consist </description> </application> -<application title="E-Bike" location="/data/user/qt/ebike-ui" main="main.qml" icon="/data/user/qt/ebike-ui/preview_l.jpg"> +<application title="E-Bike" location="/data/user/qt/ebike-ui" main="main.qml" icon="/data/user/qt/ebike-ui/preview_l.jpg" exclude="linux-emulator"> <description> An E-bike instrument cluster concept designed and implemented by Qt. @@ -109,12 +109,14 @@ Each menu item opens a page that shows the graphical appearance of a control, al </description> </application> -<application title="Advanced custom materials" location="/data/user/qt/custommaterial" main="main.qml" icon="/data/user/qt/custommaterial/preview_l.jpg" exclude="linux-beaglebone;linux-colibri-vf;linux-colibri-imx7;linux-imx7s-warp;linux-nitrogen7;linux-colibri-imx6ull"> +<!-- +<application title="Advanced custom materials" location="/data/user/qt/advancedcustommaterial" main="main.qml" icon="/data/user/qt/advancedcustommaterial/preview_l.jpg" exclude="linux-beaglebone;linux-colibri-vf;linux-colibri-imx7;linux-imx7s-warp;linux-nitrogen7;linux-colibri-imx6ull"> <description> This example demonstrates advanced materials in Qt3D. Demo shows complex shaders and demonstrates controlling your shader properties with QtQuick user interface and Animation. Water is a 3D mesh, that is modeled and uv mapped inside Blender, and then brought into Scene 3D as an .obj file. </description> </application> +--> </applications> diff --git a/basicsuite/ebike-ui/StatsPage.qml b/basicsuite/ebike-ui/StatsPage.qml index 3a0351e..2b3d418 100644 --- a/basicsuite/ebike-ui/StatsPage.qml +++ b/basicsuite/ebike-ui/StatsPage.qml @@ -59,7 +59,7 @@ Page { } function timestampToReadable(timestamp) { - return Moment.moment.unix(timestamp).calendar(); + return moment.unix(timestamp).calendar(); } // On new trip data (save clicked), switch index to new trip |