diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2012-12-14 15:10:49 +0100 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2012-12-14 15:10:49 +0100 |
commit | f1c2d948dd037ef7ab41eedb9076aab2e3e07d14 (patch) | |
tree | 981de0c3c05d2ef1a0a4b16f47749e394269b183 | |
parent | da452450a57323b69684bff5f91a866dd5f7626d (diff) |
update version to Qt 5.
-rw-r--r-- | Button.qml | 2 | ||||
-rw-r--r-- | CameraSlide.qml | 4 | ||||
-rw-r--r-- | CanvasSlide.qml | 2 | ||||
-rw-r--r-- | DemoMain.qml | 2 | ||||
-rw-r--r-- | EffectsSlide.qml | 4 | ||||
-rw-r--r-- | ExamplesSlide.qml | 2 | ||||
-rw-r--r-- | FontSlide.qml | 2 | ||||
-rw-r--r-- | NoisyGradient.qml | 2 | ||||
-rw-r--r-- | NormalMapGenerator.qml | 2 | ||||
-rw-r--r-- | OpacityTransitionPresentation.qml | 2 | ||||
-rw-r--r-- | ParticleSlide.qml | 2 | ||||
-rw-r--r-- | ShaderSlide.qml | 4 | ||||
-rw-r--r-- | SlideDeck.qml | 18 | ||||
-rw-r--r-- | Swirl.qml | 4 | ||||
-rw-r--r-- | VideoSlide.qml | 6 | ||||
-rw-r--r-- | WidgetsSlide.qml | 2 | ||||
-rw-r--r-- | main.qml | 2 | ||||
-rw-r--r-- | main_lofi.qml | 2 |
18 files changed, 32 insertions, 32 deletions
@@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/CameraSlide.qml b/CameraSlide.qml index 9bc6d7e..e6b4d97 100644 --- a/CameraSlide.qml +++ b/CameraSlide.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtMultimedia 5.0 +import QtMultimedia 5 import Qt.labs.presentation 1.0 import QtGraphicalEffects 1.0 diff --git a/CanvasSlide.qml b/CanvasSlide.qml index 970f0ed..1a60273 100644 --- a/CanvasSlide.qml +++ b/CanvasSlide.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/DemoMain.qml b/DemoMain.qml index 7e40f08..510330c 100644 --- a/DemoMain.qml +++ b/DemoMain.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/EffectsSlide.qml b/EffectsSlide.qml index 88eea56..f6436d9 100644 --- a/EffectsSlide.qml +++ b/EffectsSlide.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -180,7 +180,7 @@ Slide { } Text { - text: "Qt 5.0" + text: "Qt 5" font.pixelSize: parent.height * 0.15 font.bold: true; font.underline: true; diff --git a/ExamplesSlide.qml b/ExamplesSlide.qml index f12391b..4fe62e7 100644 --- a/ExamplesSlide.qml +++ b/ExamplesSlide.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/FontSlide.qml b/FontSlide.qml index f77e013..610033b 100644 --- a/FontSlide.qml +++ b/FontSlide.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/NoisyGradient.qml b/NoisyGradient.qml index 19b0f8d..904f14e 100644 --- a/NoisyGradient.qml +++ b/NoisyGradient.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/NormalMapGenerator.qml b/NormalMapGenerator.qml index b6da876..c6f55c7 100644 --- a/NormalMapGenerator.qml +++ b/NormalMapGenerator.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/OpacityTransitionPresentation.qml b/OpacityTransitionPresentation.qml index 1e09115..1fbe17e 100644 --- a/OpacityTransitionPresentation.qml +++ b/OpacityTransitionPresentation.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/ParticleSlide.qml b/ParticleSlide.qml index 60ca9fd..b53e8a3 100644 --- a/ParticleSlide.qml +++ b/ParticleSlide.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/ShaderSlide.qml b/ShaderSlide.qml index a830ff6..2a04f28 100644 --- a/ShaderSlide.qml +++ b/ShaderSlide.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -177,7 +177,7 @@ Slide { v_TexCoord = qt_MultiTexCoord0; - v_light = dot(normalize(vec3(-sin(nLocPos.x * 5.0 + time) * 5.0 * amp, 0, -1)), vec3(0, 0, -1)); + v_light = dot(normalize(vec3(-sin(nLocPos.x * 5 + time) * 5.0 * amp, 0, -1)), vec3(0, 0, -1)); } " diff --git a/SlideDeck.qml b/SlideDeck.qml index 652fd00..e905ff4 100644 --- a/SlideDeck.qml +++ b/SlideDeck.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -80,12 +80,12 @@ OpacityTransitionPresentation { Slide { id: introSlide - writeInText: "The following is a quick tour of what is new in Qt 5.0. + writeInText: "The following is a quick tour of what is new in Qt 5. -It is an application written with Qt Quick 2.0, based on the modules shipped with Qt 5.0 and using the QML Presentation System from Qt labs. The source code is available from: +It is an application written with Qt Quick 2.0, based on the modules shipped with Qt 5 and using the QML Presentation System from Qt labs. The source code is available from: https://git.gitorious.org/qt-labs/qt5-launch-demo.git -We hope you will enjoy Qt 5.0 as much as we have enjoyed creating it." +We hope you will enjoy Qt 5 as much as we have enjoyed creating it." Image { source: "images/qt-logo.png" @@ -101,13 +101,13 @@ We hope you will enjoy Qt 5.0 as much as we have enjoyed creating it." } Slide { - centeredText: "Qt 5.0" - fontScale: 2; + centeredText: "Qt 5" + fontScale: 4; } Slide { - title: "Qt 5.0 - Features" + title: "Qt 5 - Features" writeInText: "OpenGL based scene graph for Qt Quick 2.0 - providing velvet animations, particles and impressive graphical effects Multimedia - Audio, Video and Camera support on all major platforms @@ -183,7 +183,7 @@ It also integrates nicely with the Qt Graphical Effects module." } Slide { - title: "Qt 5.0 - Features" + title: "Qt 5 - Features" writeInText: "Modularization of the Qt libraries - sanitizing our codebase and making it possible to deploy only that which is needed Qt Platform Abstraction - Unifying the Qt codebase across platforms and greatly reducing the effort needed to port to new platforms @@ -192,7 +192,7 @@ Wayland support - Wayland 1.0 compatible Qt backend and compositor framework" } Slide { - title: "Qt 5.0 - Features" + title: "Qt 5 - Features" writeInText: "C++ language features - template based connect(), C++11 support, move constructors and more Connectivity and Networking - DNS lookup, improved IPv6 support @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -99,7 +99,7 @@ ShaderEffect { + sin(-ty * 8.0 + d.w * qt_MultiTexCoord0.x * 29. + 15. * d.z); highp float x = sin(-tx + d.x * qt_MultiTexCoord0.x * 213. + 15. * d.y) + sin(ty * 2.0 + d.z * qt_MultiTexCoord0.x * 107. + 12. * d.w) - + sin(tz * 4.0 + d.y * qt_MultiTexCoord0.x * 13. + 5.0 * d.x) + + sin(tz * 4.0 + d.y * qt_MultiTexCoord0.x * 13. + 5. * d.x) + sin(-ty * 8.0 + d.w * qt_MultiTexCoord0.x * 15. + 7. * d.z); xx = x; diff --git a/VideoSlide.qml b/VideoSlide.qml index e87606b..adedbb7 100644 --- a/VideoSlide.qml +++ b/VideoSlide.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtMultimedia 5.0 +import QtMultimedia 5 import Qt.labs.presentation 1.0 import QtGraphicalEffects 1.0 @@ -76,7 +76,7 @@ Slide { Text { id: label color: "white" - text: "Qt 5.0" + text: "Qt 5" font.family: "Times New Roman" font.bold: true; font.pixelSize: 60 diff --git a/WidgetsSlide.qml b/WidgetsSlide.qml index dbfe2df..e1bf330 100644 --- a/WidgetsSlide.qml +++ b/WidgetsSlide.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/main_lofi.qml b/main_lofi.qml index de8fb4f..8ebd802 100644 --- a/main_lofi.qml +++ b/main_lofi.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt 5.0 launch demo. +** This file is part of the Qt 5 launch demo. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: |