1 files changed, 33 insertions, 11 deletions
diff --git a/src/charts/legend/legendmarkeritem.cpp b/src/charts/legend/legendmarkeritem.cpp
index a714023a..125199ea 100644
--- a/src/charts/legend/legendmarkeritem.cpp
+++ b/src/charts/legend/legendmarkeritem.cpp
@@ -1,23 +1,31 @@
-/******************************************************************************
+/****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Charts module.
-**
-** $QT_BEGIN_LICENSE:COMM$
+** This file is part of the Qt Charts module of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:GPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
-******************************************************************************/
+****************************************************************************/
 
 #include <QtGui/QPainter>
 #include <QtWidgets/QGraphicsSceneEvent>
@@ -116,9 +124,14 @@ void LegendMarkerItem::setGeometry(const QRectF &rect)
     qreal width = rect.width();
     qreal x = m_margin + m_markerRect.width() + m_space + m_margin;
     QRectF truncatedRect;
+    const QString html = ChartPresenter::truncatedText(m_textItem->font(), m_label, qreal(0.0),
+                                                       width - x, rect.height(), truncatedRect);
+    m_textItem->setHtml(html);
+    if (m_marker->m_legend->showToolTips() && html != m_label)
+        m_textItem->setToolTip(m_label);
+    else
+        m_textItem->setToolTip(QString());
 
-    m_textItem->setHtml(ChartPresenter::truncatedText(m_textItem->font(), m_label, qreal(0.0),
-                                                      width - x, rect.height(), truncatedRect));
     m_textItem->setTextWidth(truncatedRect.width());
 
     qreal y = qMax(m_markerRect.height() + 2 * m_margin, truncatedRect.height() + 2 * m_margin);
@@ -187,6 +200,15 @@ void LegendMarkerItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
     emit m_marker->q_ptr->hovered(false);
 }
 
+QString LegendMarkerItem::displayedLabel() const
+{
+    return m_textItem->toHtml();
+}
+
+void LegendMarkerItem::setToolTip(const QString &tip)
+{
+    m_textItem->setToolTip(tip);
+}
 
 #include "moc_legendmarkeritem_p.cpp"