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

Change-Id: Ia7ddf5743f08b10e6514d500e2609f5aacbee660

3 files changed, 11 insertions, 12 deletions

diff --git a/src/charts/axis/verticalaxis.cpp b/src/charts/axis/verticalaxis.cpp
index fc0f093b..6282f297 100644
--- a/src/charts/axis/verticalaxis.cpp
+++ b/src/charts/axis/verticalaxis.cpp
@@ -108,12 +108,13 @@ void VerticalAxis::updateGeometry()
     //title
     QRectF titleBoundingRect;
     QString titleText = axis()->titleText();
-    qreal availableSpace = axisRect.height() - labelPadding();
+    qreal labelAvailableSpace = axisRect.width();
     if (!titleText.isEmpty() && titleItem()->isVisible()) {
-        availableSpace -= titlePadding() * 2.0;
+        const qreal titleAvailableSpace =
+                axisRect.height() - labelPadding() - (titlePadding() * 2.0);
         qreal minimumLabelWidth = ChartPresenter::textBoundingRect(axis()->labelsFont(),
                                                                    QStringLiteral("...")).width();
-        qreal titleSpace = availableSpace - minimumLabelWidth;
+        qreal titleSpace = titleAvailableSpace - minimumLabelWidth;
         title->setHtml(ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(90.0),
                                                      titleSpace, gridRect.height(),
                                                      titleBoundingRect));
@@ -132,8 +133,7 @@ void VerticalAxis::updateGeometry()
 
         title->setTransformOriginPoint(titleBoundingRect.center());
         title->setRotation(270);
-
-        availableSpace -= titleBoundingRect.height();
+        labelAvailableSpace -= titleBoundingRect.height();
     }
 
     QList<QGraphicsItem *> lines = gridItems();
@@ -166,10 +166,9 @@ void VerticalAxis::updateGeometry()
             labelItem->setHtml(text);
         } else {
             qreal labelHeight = (axisRect.height() / layout.count()) - (2 * labelPadding());
-            QString truncatedText = ChartPresenter::truncatedText(axis()->labelsFont(), text,
-                                                                  axis()->labelsAngle(),
-                                                                  availableSpace,
-                                                                  labelHeight, boundingRect);
+            QString truncatedText =
+                    ChartPresenter::truncatedText(axis()->labelsFont(), text, axis()->labelsAngle(),
+                                                  labelAvailableSpace, labelHeight, boundingRect);
             labelItem->setTextWidth(ChartPresenter::textBoundingRect(axis()->labelsFont(),
                                                                      truncatedText).width());
             labelItem->setHtml(truncatedText);
diff --git a/src/charts/qabstractseries.cpp b/src/charts/qabstractseries.cpp
index 48f7cf04..d9d33307 100644
--- a/src/charts/qabstractseries.cpp
+++ b/src/charts/qabstractseries.cpp
@@ -234,8 +234,8 @@ QT_CHARTS_BEGIN_NAMESPACE
     \list
     \li Series animations are not supported for accelerated series.
     \li Point labels are not supported for accelerated series.
-    \li Marker shapes are ignored for accelerated series.
-        Only plain scatter dots are supported.
+    \li Pen styles and marker shapes are ignored for accelerated series.
+        Only solid lines and plain scatter dots are supported.
         The scatter dots may be circular or rectangular, depending on the underlying graphics
         hardware and drivers.
     \li Polar charts do not support accelerated series.
diff --git a/src/charts/xychart/qxymodelmapper.cpp b/src/charts/xychart/qxymodelmapper.cpp
index f3ed4e43..d1f2e9f5 100644
--- a/src/charts/xychart/qxymodelmapper.cpp
+++ b/src/charts/xychart/qxymodelmapper.cpp
@@ -267,7 +267,7 @@ qreal QXYModelMapperPrivate::valueFromModel(QModelIndex index)
     case QVariant::DateTime:
         return value.toDateTime().toMSecsSinceEpoch();
     case QVariant::Date:
-        return QDateTime(value.toDate()).toMSecsSinceEpoch();
+        return value.toDate().startOfDay().toMSecsSinceEpoch();
     default:
         return value.toReal();
     }