From ca4dbd5675ad3aabffb9fb92f19b53b4c5028981 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 31 Mar 2015 20:23:27 +0200
Subject: Address uninitialized pointer variables

Coverity CID 10721, 84861, 86705, 85424, 85422,
85259, 84863, 84857

Change-Id: Ia86970b5ac4e0be9de01b79b618d33011da6a328
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 examples/quick/rendercontrol/cuberenderer.cpp         |  4 +++-
 examples/quick/rendercontrol/window_multithreaded.cpp | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'examples')

diff --git a/examples/quick/rendercontrol/cuberenderer.cpp b/examples/quick/rendercontrol/cuberenderer.cpp
index be503e3d8f..1b2d7dec8f 100644
--- a/examples/quick/rendercontrol/cuberenderer.cpp
+++ b/examples/quick/rendercontrol/cuberenderer.cpp
@@ -52,7 +52,9 @@ CubeRenderer::CubeRenderer(QOffscreenSurface *offscreenSurface)
     : m_offscreenSurface(offscreenSurface),
       m_context(0),
       m_program(0),
-      m_vbo(0)
+      m_vbo(0),
+      m_vao(0),
+      m_matrixLoc(0)
 {
 }
 
diff --git a/examples/quick/rendercontrol/window_multithreaded.cpp b/examples/quick/rendercontrol/window_multithreaded.cpp
index 6c0de93a19..9b6020a347 100644
--- a/examples/quick/rendercontrol/window_multithreaded.cpp
+++ b/examples/quick/rendercontrol/window_multithreaded.cpp
@@ -77,7 +77,12 @@ static const QEvent::Type STOP = QEvent::Type(QEvent::User + 4);
 static const QEvent::Type UPDATE = QEvent::Type(QEvent::User + 5);
 
 QuickRenderer::QuickRenderer()
-    : m_fbo(0),
+    : m_context(0),
+      m_surface(0),
+      m_fbo(0),
+      m_window(0),
+      m_quickWindow(0),
+      m_renderControl(0),
       m_cubeRenderer(0),
       m_quit(false)
 {
@@ -209,7 +214,8 @@ void QuickRenderer::aboutToQuit()
 }
 
 WindowMultiThreaded::WindowMultiThreaded()
-    : m_rootItem(0),
+    : m_qmlComponent(Q_NULLPTR),
+      m_rootItem(0),
       m_quickInitialized(false),
       m_psrRequested(false)
 {
-- 
cgit v1.2.3


From a6abc54fc6d35246cee2f686d4c9abb76564ae83 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@digia.com>
Date: Wed, 18 Feb 2015 09:23:32 +0100
Subject: add manual tests for touch interaction

So far there are manual tests for Flickable and
MultiPointTouchArea.  It can be expanded later.

Change-Id: Ifa838b68f137a49647a208dc15f22c90f1e02d1f
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
 examples/quick/shared/Slider.qml       | 3 ++-
 examples/quick/shared/quick_shared.qrc | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'examples')

diff --git a/examples/quick/shared/Slider.qml b/examples/quick/shared/Slider.qml
index b3b2c98271..1728024715 100644
--- a/examples/quick/shared/Slider.qml
+++ b/examples/quick/shared/Slider.qml
@@ -44,6 +44,7 @@ Item {
     property real init: min+(max-min)/2
     property string name: "Slider"
     property color color: "#0066cc"
+    property real minLabelWidth: 44
 
     Component.onCompleted: setValue(init)
     function setValue(v) {
@@ -57,7 +58,7 @@ Item {
         anchors.left: parent.left
         anchors.leftMargin: 16
         height: childrenRect.height
-        width: Math.max(44, childrenRect.width)
+        width: Math.max(minLabelWidth, childrenRect.width)
         anchors.verticalCenter: parent.verticalCenter
         Text {
             text: slider.name + ":"
diff --git a/examples/quick/shared/quick_shared.qrc b/examples/quick/shared/quick_shared.qrc
index 015a1f99d5..ea7e0fdd89 100644
--- a/examples/quick/shared/quick_shared.qrc
+++ b/examples/quick/shared/quick_shared.qrc
@@ -7,5 +7,8 @@
         <file>TextField.qml</file>
         <file>images/back.png</file>
         <file>images/next.png</file>
+        <file>images/checkmark.png</file>
+        <file>Slider.qml</file>
+        <file>images/slider_handle.png</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3