Merge remote-tracking branch 'origin/develop'

Change-Id: I618328a9221c9510a5d455389a895122fb32bec1

3 files changed, 7 insertions, 4 deletions

diff --git a/README b/README
index 18df6e6a..f4cbd3d5 100644
--- a/README
+++ b/README
@@ -48,7 +48,7 @@ If you want to uninstall the module:
 Building as a statically linked library
 =======================================
 
-The same as above applies you will just have to add static to the CONFIG:
+The same as above applies, you will just have to add static to the CONFIG:
     qmake CONFIG+=static
 
 Documentation
diff --git a/examples/qmlbars/qml/qmlbars/main.qml b/examples/qmlbars/qml/qmlbars/main.qml
index f2278d83..5b1cc006 100644
--- a/examples/qmlbars/qml/qmlbars/main.qml
+++ b/examples/qmlbars/qml/qmlbars/main.qml
@@ -72,8 +72,11 @@ Item {
                         var currentColRole = graphData.model.get(i).month
                         if (currentRowRole === rowRole && currentColRole === colRole) {
                             tableView.currentRow = i
-                            tableView.selection.clear()
-                            tableView.selection.select(i)
+                            // Workaround to 5.2 row selection issue
+                            if (typeof tableView.selection != "undefined") {
+                                tableView.selection.clear()
+                                tableView.selection.select(i)
+                            }
                             break
                         }
                     }
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index a5dc53b1..a457b545 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -1264,7 +1264,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
 
         m_drawer->drawLabel(*selectedItem, labelItem, viewMatrix, projectionMatrix,
                             zeroVector, zeroVector, 0, m_cachedSelectionMode, m_labelShader,
-                            m_labelObj, activeCamera, true, false, Drawer::LabelMid);
+                            m_labelObj, activeCamera, true, false, Drawer::LabelOver);
 
         // Reset label update flag; they should have been updated when we get here
         m_updateLabels = false;