Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1

Conflicts:
	sync.profile

Change-Id: Icdf61d347a6d0b3624867ceb8c1e4220c6c78a76

5 files changed, 11 insertions, 6 deletions

diff --git a/src/charts/chartpresenter.cpp b/src/charts/chartpresenter.cpp
index 97652fa8..e6d38db7 100644
--- a/src/charts/chartpresenter.cpp
+++ b/src/charts/chartpresenter.cpp
@@ -557,7 +557,7 @@ QString ChartPresenter::numberToString(int value)
         return QString::number(value);
 }
 
-void ChartPresenter::ensureGLWidget()
+void ChartPresenter::updateGLWidget()
 {
 #ifndef QT_NO_OPENGL
     // GLWidget pointer is wrapped in QPointer as its parent is not in our control, and therefore
@@ -574,6 +574,9 @@ void ChartPresenter::ensureGLWidget()
             m_glWidget->show();
         }
     }
+    // Make sure we update the widget in a timely manner
+    if (!m_glWidget.isNull())
+        m_glWidget->update();
 #endif
 }
 
diff --git a/src/charts/chartpresenter_p.h b/src/charts/chartpresenter_p.h
index 556a3c50..5b713799 100644
--- a/src/charts/chartpresenter_p.h
+++ b/src/charts/chartpresenter_p.h
@@ -174,7 +174,7 @@ public:
     QString numberToString(double value, char f = 'g', int prec = 6);
     QString numberToString(int value);
 
-    void ensureGLWidget();
+    void updateGLWidget();
     void glSetUseWidget(bool enable) { m_glUseWidget = enable; }
 
 private:
diff --git a/src/charts/xychart/xychart.cpp b/src/charts/xychart/xychart.cpp
index 700a6705..28553d55 100644
--- a/src/charts/xychart/xychart.cpp
+++ b/src/charts/xychart/xychart.cpp
@@ -121,8 +121,8 @@ void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoin
 
 void XYChart::updateGlChart()
 {
-    presenter()->ensureGLWidget();
     dataSet()->glXYSeriesDataManager()->setPoints(m_series, domain());
+    presenter()->updateGLWidget();
     updateGeometry();
 }
 
diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp
index 3362daf2..596c1382 100644
--- a/src/chartsqml2/declarativechart.cpp
+++ b/src/chartsqml2/declarativechart.cpp
@@ -598,7 +598,9 @@ void DeclarativeChart::renderScene()
     QSize chartSize = m_chart->size().toSize();
     if (!m_sceneImage || chartSize != m_sceneImage->size()) {
         delete m_sceneImage;
-        m_sceneImage = new QImage(chartSize, QImage::Format_ARGB32);
+        qreal dpr = window() ? window()->devicePixelRatio() : 1.0;
+        m_sceneImage = new QImage(chartSize * dpr, QImage::Format_ARGB32);
+        m_sceneImage->setDevicePixelRatio(dpr);
         m_sceneImageNeedsClear = true;
     }
 
diff --git a/sync.profile b/sync.profile
index b288cc4e..c9b8233d 100644
--- a/sync.profile
+++ b/sync.profile
@@ -13,6 +13,6 @@
 #   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
 #
 %dependencies = (
-    "qtbase" => "refs/heads/dev",
-    "qtdeclarative" => "refs/heads/dev",
+    "qtbase" => "",
+    "qtdeclarative" => "",
 );