Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I33db683ebf12248b2ed14eeaf65c4bcade14bfbf

8 files changed, 14 insertions, 15 deletions

diff --git a/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp b/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp
index 79c06d0720..fa005781d8 100644
--- a/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp
@@ -72,8 +72,8 @@ void PieChart::paint(QPainter *painter)
 {
     QPen pen(m_color, 2);
     painter->setPen(pen);
-    painter->setRenderHints(QPainter::HighQualityAntialiasing, true);
-    painter->drawPie(boundingRect(), 90 * 16, 290 * 16);
+    painter->setRenderHints(QPainter::Antialiasing, true);
+    painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16);
 }
 //![1]
 
diff --git a/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp b/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp
index b0b116f66a..ddcb1b3efd 100644
--- a/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp
@@ -69,8 +69,8 @@ void PieChart::paint(QPainter *painter)
 {
     QPen pen(m_color, 2);
     painter->setPen(pen);
-    painter->setRenderHints(QPainter::HighQualityAntialiasing, true);
-    painter->drawPie(boundingRect(), 90 * 16, 290 * 16);
+    painter->setRenderHints(QPainter::Antialiasing, true);
+    painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16);
 }
 
 //![0]
diff --git a/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp b/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp
index f12b4f7efe..a63035033f 100644
--- a/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp
@@ -75,8 +75,8 @@ void PieChart::paint(QPainter *painter)
 {
     QPen pen(m_color, 2);
     painter->setPen(pen);
-    painter->setRenderHints(QPainter::HighQualityAntialiasing, true);
-    painter->drawPie(boundingRect(), 90 * 16, 290 * 16);
+    painter->setRenderHints(QPainter::Antialiasing, true);
+    painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16);
 }
 
 void PieChart::clearChart()
diff --git a/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
index c929deba5a..2afe82048f 100644
--- a/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
+++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
@@ -60,7 +60,7 @@ void PieSlice::paint(QPainter *painter)
 {
     QPen pen(m_color, 2);
     painter->setPen(pen);
-    painter->setRenderHints(QPainter::HighQualityAntialiasing, true);
-    painter->drawPie(boundingRect(), 90 * 16, 290 * 16);
+    painter->setRenderHints(QPainter::Antialiasing, true);
+    painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16);
 }
 
diff --git a/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp
index 2cfbe4de1b..9fb61d9cd8 100644
--- a/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp
@@ -58,7 +58,7 @@ void PieChart::setName(const QString &name)
 //![0]
 QQmlListProperty<PieSlice> PieChart::slices()
 {
-    return QQmlListProperty<PieSlice>(this, 0, &PieChart::append_slice);
+    return QQmlListProperty<PieSlice>(this, 0, &PieChart::append_slice, 0, 0, 0);
 }
 
 void PieChart::append_slice(QQmlListProperty<PieSlice> *list, PieSlice *slice)
diff --git a/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp
index 3269fd60f2..52b409aa22 100644
--- a/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp
+++ b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp
@@ -80,7 +80,7 @@ void PieSlice::paint(QPainter *painter)
 {
     QPen pen(m_color, 2);
     painter->setPen(pen);
-    painter->setRenderHints(QPainter::HighQualityAntialiasing, true);
-    painter->drawPie(boundingRect(), m_fromAngle * 16, m_angleSpan * 16);
+    painter->setRenderHints(QPainter::Antialiasing, true);
+    painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), m_fromAngle * 16, m_angleSpan * 16);
 }
 
diff --git a/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp b/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp
index dce05aeab9..295bb8961d 100644
--- a/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp
+++ b/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp
@@ -57,7 +57,7 @@ void PieChart::setName(const QString &name)
 
 QQmlListProperty<PieSlice> PieChart::slices()
 {
-    return QQmlListProperty<PieSlice>(this, 0, &PieChart::append_slice);
+    return QQmlListProperty<PieSlice>(this, 0, &PieChart::append_slice, 0, 0, 0);
 }
 
 void PieChart::append_slice(QQmlListProperty<PieSlice> *list, PieSlice *slice)
@@ -68,4 +68,3 @@ void PieChart::append_slice(QQmlListProperty<PieSlice> *list, PieSlice *slice)
         chart->m_slices.append(slice);
     }
 }
-
diff --git a/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp
index 3269fd60f2..52b409aa22 100644
--- a/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp
+++ b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp
@@ -80,7 +80,7 @@ void PieSlice::paint(QPainter *painter)
 {
     QPen pen(m_color, 2);
     painter->setPen(pen);
-    painter->setRenderHints(QPainter::HighQualityAntialiasing, true);
-    painter->drawPie(boundingRect(), m_fromAngle * 16, m_angleSpan * 16);
+    painter->setRenderHints(QPainter::Antialiasing, true);
+    painter->drawPie(boundingRect().adjusted(1, 1, -1, -1), m_fromAngle * 16, m_angleSpan * 16);
 }