diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2014-02-13 16:24:31 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2014-02-14 13:31:22 +0200 |
| commit | 724015cb023e5d4364e375ec2fe8d45c1ba6d758 (patch) | |
| tree | dc40f646d79f059300aa74ebb191a495f51091fc /basicsuite | |
| parent | 8260538f263f7109207e0312c850d10c32b752c5 (diff) | |
Fix issues in qt5-launcher presentation
No warnings on start
Using a valid fontfamily for Context2D example
velocityfrommotion particle demo is now visible
Change-Id: Ibc805d32f55950279918935d1711f61afe0d7308
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
Diffstat (limited to 'basicsuite')
3 files changed, 4 insertions, 3 deletions
diff --git a/basicsuite/qt5-launchpresentation/CanvasSlide.qml b/basicsuite/qt5-launchpresentation/CanvasSlide.qml index d972b41..46f98ed 100644 --- a/basicsuite/qt5-launchpresentation/CanvasSlide.qml +++ b/basicsuite/qt5-launchpresentation/CanvasSlide.qml @@ -105,7 +105,7 @@ ctx.fill(); ctx.stroke(); ctx.fillStyle = 'aquamarine' -ctx.font = '20px sansserif' +ctx.font = '20px sans-serif' ctx.fillText('HTML Canvas API!', 100, 300); ctx.fillText('Imperative Drawing!', 100, 340); diff --git a/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml b/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml index dc7cc02..542ec6f 100644 --- a/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml +++ b/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml @@ -51,8 +51,8 @@ Presentation { property bool inTransition: false; - property variant fromSlide; - property variant toSlide; + property variant fromSlide: Item { } + property variant toSlide: Item { } property int transitionTime: 500; diff --git a/basicsuite/qt5-launchpresentation/particles/velocityfrommotion.qml b/basicsuite/qt5-launchpresentation/particles/velocityfrommotion.qml index 2aa3617..2824e1d 100644 --- a/basicsuite/qt5-launchpresentation/particles/velocityfrommotion.qml +++ b/basicsuite/qt5-launchpresentation/particles/velocityfrommotion.qml @@ -47,6 +47,7 @@ Item { height: 480 width: 320 + visible: true MouseArea { id: mouseArea |