From dffe4ab249ced63255e83942be447df4183bf2f2 Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@viroteck.net>
Date: Tue, 5 Jul 2016 17:16:44 +0200
Subject: demos: Fix installation of photoviewer example and add to build

deployment.pri seems suspicious (and qmake errors about it actually), so just
use the example install path and trust that it will be okay.

Change-Id: Id3b6abd80f84485e006473130873ab89ee11c0d4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 examples/quick/demos/demos.pro                   |  3 +--
 examples/quick/demos/photoviewer/deployment.pri  | 23 -----------------------
 examples/quick/demos/photoviewer/photoviewer.pro |  7 ++-----
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 examples/quick/demos/photoviewer/deployment.pri

(limited to 'examples')

diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
index 9aac7bf6f7..e6937683ab 100644
--- a/examples/quick/demos/demos.pro
+++ b/examples/quick/demos/demos.pro
@@ -5,9 +5,8 @@ SUBDIRS = samegame \
             tweetsearch \
             maroon \
             photosurface \
+            photoviewer \
             stocqt
 
 qtHaveModule(xmlpatterns): SUBDIRS += rssnews
 
-EXAMPLE_FILES = \
-    photoviewer
diff --git a/examples/quick/demos/photoviewer/deployment.pri b/examples/quick/demos/photoviewer/deployment.pri
deleted file mode 100644
index 839b3b5cac..0000000000
--- a/examples/quick/demos/photoviewer/deployment.pri
+++ /dev/null
@@ -1,23 +0,0 @@
-android-no-sdk {
-    target.path = /data/user/qt
-    export(target.path)
-    INSTALLS += target
-} else:android {
-    x86 {
-        target.path = /libs/x86
-    } else: armeabi-v7a {
-        target.path = /libs/armeabi-v7a
-    } else {
-        target.path = /libs/armeabi
-    }
-    export(target.path)
-    INSTALLS += target
-} else:unix {
-    isEmpty(target.path) {
-        target.path = /opt/$${TARGET}/bin
-        export(target.path)
-    }
-    INSTALLS += target
-}
-
-export(INSTALLS)
diff --git a/examples/quick/demos/photoviewer/photoviewer.pro b/examples/quick/demos/photoviewer/photoviewer.pro
index 704e2ce003..4bfdb86f31 100644
--- a/examples/quick/demos/photoviewer/photoviewer.pro
+++ b/examples/quick/demos/photoviewer/photoviewer.pro
@@ -15,8 +15,5 @@ TRANSLATIONS += i18n/qml_fr.ts \
 
 RESOURCES += qml.qrc
 
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Default rules for deployment.
-include(deployment.pri)
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/photoviewer
+INSTALLS += target
-- 
cgit v1.2.3


From c8c1d4964ba4af8700d01cefdd80359090479bc0 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@theqtcompany.com>
Date: Mon, 30 May 2016 10:19:20 +0200
Subject: PieChart examples: initialize members

Coverity (CID 161680, 161678) pointed out that constructors don't
initialize some members; getters would have returned drivel if called
before setters.  Unimportant but we should set a good example in our
example code.

Change-Id: Ia0483cfbe2cae379a0e84f10db1d8edc9cb5c52b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 .../tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp   | 2 +-
 .../qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples')

diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp
index 965e5152c1..d963b6d1b4 100644
--- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp
+++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp
@@ -41,7 +41,7 @@
 #include "pieslice.h"
 
 PieChart::PieChart(QQuickItem *parent)
-    : QQuickItem(parent)
+    : QQuickItem(parent), m_pieSlice(0)
 {
 }
 
diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp b/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp
index ceb0041ec8..50c018e33e 100644
--- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp
+++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp
@@ -42,7 +42,7 @@
 #include <QPainter>
 
 PieSlice::PieSlice(QQuickItem *parent)
-    : QQuickPaintedItem(parent)
+    : QQuickPaintedItem(parent), m_fromAngle(0), m_angleSpan(0)
 {
 }
 
-- 
cgit v1.2.3