Fixing versioning...

7 files changed, 18 insertions, 17 deletions

diff --git a/CanvasSlide.qml b/CanvasSlide.qml
index 1a60273..ffdb819 100644
--- a/CanvasSlide.qml
+++ b/CanvasSlide.qml
@@ -44,7 +44,7 @@ import Qt.labs.presentation 1.0
 Slide {
     id: slide
 
-    title: "Qt Quick 2.0 - Canvas"
+    title: "Qt Quick -  Canvas"
 
     Rectangle {
         height: parent.height
diff --git a/DemoMain.qml b/DemoMain.qml
index 510330c..05454be 100644
--- a/DemoMain.qml
+++ b/DemoMain.qml
@@ -56,7 +56,7 @@ Item {
     NoisyGradient {
         anchors.fill: parent;
         gradient: Gradient {
-            GradientStop { position: 0.0; color: Qt.rgba(0.64, 0.82, 0.15) }
+            GradientStop { position: 0.0; color: Qt.rgba(0.64 * 0.6, 0.82 * 0.6, 0.15 * 0.6) }
             GradientStop { position: 1.0; color: "black" }
         }
         visible: !parent.useSimpleGradient
diff --git a/ExamplesSlide.qml b/ExamplesSlide.qml
index 4fe62e7..9e098dc 100644
--- a/ExamplesSlide.qml
+++ b/ExamplesSlide.qml
@@ -45,7 +45,7 @@ Slide
 {
     id: slide
 
-    title: "Qt Quick 2.0"
+    title: "Qt Quick"
 
     Row {
         anchors.fill: parent
diff --git a/FontSlide.qml b/FontSlide.qml
index 610033b..4885fe0 100644
--- a/FontSlide.qml
+++ b/FontSlide.qml
@@ -43,7 +43,7 @@ import Qt.labs.presentation 1.0
 
 Slide {
     id: fontSlide;
-    title: "Qt Quick 2.0 - Fonts"
+    title: "Qt Quick -  Fonts"
     writeInText: "The default font rendering in Qt Quick 2.0 uses distance fields, making it possible to do fully transformable text with subpixel positioning and subpixel antialiasing.
 
 Native font rendering is also an option for applications that want to look native."
diff --git a/ParticleSlide.qml b/ParticleSlide.qml
index b53e8a3..d5b4d94 100644
--- a/ParticleSlide.qml
+++ b/ParticleSlide.qml
@@ -45,7 +45,7 @@ Slide
 {
     id: slide
 
-    title: "Qt Quick 2.0 - Particle System"
+    title: "Qt Quick -  Particle System"
 
     Row {
         anchors.fill: parent
diff --git a/ShaderSlide.qml b/ShaderSlide.qml
index 2a04f28..57ac9ee 100644
--- a/ShaderSlide.qml
+++ b/ShaderSlide.qml
@@ -45,7 +45,7 @@ import Qt.labs.presentation 1.0
 Slide {
     id: slide
 
-    title: "Qt Quick 2.0 - ShaderEffect"
+    title: "Qt Quick - ShaderEffect"
 
     writeInText: "Harness the raw power of the graphics processor. The ShaderEffect element lets you write GLSL inline in your QML files."
 
@@ -177,7 +177,7 @@ Slide {
             v_TexCoord = qt_MultiTexCoord0;
 
 
-            v_light = dot(normalize(vec3(-sin(nLocPos.x * 5 + time) * 5.0 * amp, 0, -1)), vec3(0, 0, -1));
+            v_light = dot(normalize(vec3(-sin(nLocPos.x * 5.0 + time) * 5.0 * amp, 0, -1)), vec3(0, 0, -1));
         }
         "
 
diff --git a/SlideDeck.qml b/SlideDeck.qml
index e905ff4..3b3c543 100644
--- a/SlideDeck.qml
+++ b/SlideDeck.qml
@@ -82,17 +82,17 @@ OpacityTransitionPresentation {
 
         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 and using the QML Presentation System from Qt labs. The source code is available from:
+It is an application written with Qt Quick, 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 as much as we have enjoyed creating it."
 
-        Image {
-            source: "images/qt-logo.png"
-            opacity: 0.4
-            z: -1
-            anchors.centerIn: parent
-        }
+//        Image {
+//            source: "images/qt-logo.png"
+//            opacity: 0.4
+//            z: -1
+//            anchors.centerIn: parent
+//        }
     }
 
     Slide {
@@ -221,10 +221,11 @@ Unicode - Updated to latest Unicode specification, UTF-8 source files"
 
         Image {
 	    z: -1
-	    opacity: 0.2
+            opacity: 0.7
             source: "images/qt-logo.png"
-            height: parent.height
-	    anchors.centerIn: parent
+            anchors.top: parent.top
+            anchors.right: parent.right
+            anchors.rightMargin: parent.width * 0.15
             fillMode: Image.PreserveAspectFit
         }