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

Change-Id: Iff3e80c784ac4851cb777d9fb1543694a2156c74

1 files changed, 2 insertions, 2 deletions

diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
index bc5bf97f..a8ef0aa5 100644
--- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
+++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
@@ -59,7 +59,7 @@ QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const
         return points;
 
     qreal adjustedMin = min() + 0.5;
-    qreal offset = (qCeil(adjustedMin) - adjustedMin) * delta;
+    qreal offset = (qRound(adjustedMin) - adjustedMin) * delta;
 
     int count = qFloor(range);
     if (count < 1)
@@ -80,7 +80,7 @@ QStringList ChartBarCategoryAxisY::createCategoryLabels(const QVector<qreal>& la
     qreal d = (max() - min()) / gridRect.height();
 
     for (int i = 0; i < layout.count() - 1; ++i) {
-        qreal x = qFloor(((gridRect.height() - (layout[i + 1] + layout[i]) / 2 + gridRect.top()) * d + min() + 0.5));
+        int x = qFloor(((gridRect.height() - (layout[i + 1] + layout[i]) / 2 + gridRect.top()) * d + min() + 0.5));
         if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
             result << m_categoriesAxis->categories().at(x);
         } else {