diff options
Diffstat (limited to 'basicsuite/qt5-launchpresentation')
| -rw-r--r-- | basicsuite/qt5-launchpresentation/CanvasSlide.qml | 2 | ||||
| -rw-r--r-- | basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml | 4 | ||||
| -rw-r--r-- | basicsuite/qt5-launchpresentation/WebKitSlideContent.qml | 2 | ||||
| -rw-r--r-- | basicsuite/qt5-launchpresentation/WebkitSlide.qml | 2 | ||||
| -rw-r--r-- | basicsuite/qt5-launchpresentation/description.txt | 7 | ||||
| -rw-r--r-- | basicsuite/qt5-launchpresentation/particles/velocityfrommotion.qml | 1 | ||||
| -rw-r--r-- | basicsuite/qt5-launchpresentation/qt5-launchpresentation.pro (renamed from basicsuite/qt5-launchpresentation/qt5-lauchpresentation.pro) | 0 |
7 files changed, 9 insertions, 9 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/WebKitSlideContent.qml b/basicsuite/qt5-launchpresentation/WebKitSlideContent.qml index b0a9c77..ceb103f 100644 --- a/basicsuite/qt5-launchpresentation/WebKitSlideContent.qml +++ b/basicsuite/qt5-launchpresentation/WebKitSlideContent.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-launchpresentation/WebkitSlide.qml b/basicsuite/qt5-launchpresentation/WebkitSlide.qml index 1873ab1..9febcdf 100644 --- a/basicsuite/qt5-launchpresentation/WebkitSlide.qml +++ b/basicsuite/qt5-launchpresentation/WebkitSlide.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-launchpresentation/description.txt b/basicsuite/qt5-launchpresentation/description.txt index 48d03f3..6ad8936 100644 --- a/basicsuite/qt5-launchpresentation/description.txt +++ b/basicsuite/qt5-launchpresentation/description.txt @@ -1,6 +1,5 @@ -The following is a quick tour of what is new in Qt 5. +The following is a quick tour of what is new in Qt 5. It is an application written with Qt Quick, based on Qt 5, the source code is available from [1]. The demo makes use of the QML Presentation System, available from [2]. Qt5 launch demo has been modified slightly to run in this launcher. -It is an application written with Qt Quick, based on Qt 5. The source code is available from: https://qt.gitorious.org/qt-labs/qt5-launch-demo -The demo makes use of the QML Presentation System, available from: ssh://codereview.qt-project.org/qt-labs/qml-presentation-system.git +[1] https://qt.gitorious.org/qt-labs/qt5-launch-demo +[2] ssh://codereview.qt-project.org/qt-labs/qml-presentation-system.git -The demo has been modified slightly to run in this launcher. 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 diff --git a/basicsuite/qt5-launchpresentation/qt5-lauchpresentation.pro b/basicsuite/qt5-launchpresentation/qt5-launchpresentation.pro index c3aba46..c3aba46 100644 --- a/basicsuite/qt5-launchpresentation/qt5-lauchpresentation.pro +++ b/basicsuite/qt5-launchpresentation/qt5-launchpresentation.pro |