summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-08-15 12:22:16 +0200
committerLiang Qi <liang.qi@qt.io>2017-08-15 13:06:48 +0200
commit0168fe1f95d56850734447b118cdcf1847da1c51 (patch)
tree55763c374af875fc7228dc8d1f3771ef74c083cb /src
parentac79bf382a9fabed940b8f9be20feeb58ac205aa (diff)
parent1f47b1a7ae58702dccc57a9ccbaa905441f4fecb (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .qmake.conf examples/charts/dynamicspline/chart.cpp examples/charts/piechartdrilldown/main.cpp Change-Id: I839e97bf377c7823f2f464c097656d58f279ed77
Diffstat (limited to 'src')
-rw-r--r--src/charts/axis/linearrowitem_p.h2
-rw-r--r--src/charts/barchart/abstractbarchartitem.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/charts/axis/linearrowitem_p.h b/src/charts/axis/linearrowitem_p.h
index 2e785716..521444aa 100644
--- a/src/charts/axis/linearrowitem_p.h
+++ b/src/charts/axis/linearrowitem_p.h
@@ -58,8 +58,8 @@ public:
protected:
void mousePressEvent(QGraphicsSceneMouseEvent *event)
{
- Q_UNUSED(event)
m_axis->axisSelected();
+ QGraphicsLineItem::mousePressEvent(event);
}
QRectF boundingRect() const
diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp
index f62c0ef7..910066b5 100644
--- a/src/charts/barchart/abstractbarchartitem.cpp
+++ b/src/charts/barchart/abstractbarchartitem.cpp
@@ -500,6 +500,7 @@ void AbstractBarChartItem::createLabelItems()
QGraphicsTextItem *label = bars.at(j)->labelItem();
if (!label) {
QGraphicsTextItem *newLabel = new QGraphicsTextItem(this);
+ newLabel->setAcceptHoverEvents(false);
newLabel->document()->setDocumentMargin(ChartPresenter::textMargin());
bars.at(j)->setLabelItem(newLabel);
}