diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:22:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:06:48 +0200 |
| commit | 0168fe1f95d56850734447b118cdcf1847da1c51 (patch) | |
| tree | 55763c374af875fc7228dc8d1f3771ef74c083cb /examples/charts/dynamicspline/chart.cpp | |
| parent | ac79bf382a9fabed940b8f9be20feeb58ac205aa (diff) | |
| parent | 1f47b1a7ae58702dccc57a9ccbaa905441f4fecb (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 'examples/charts/dynamicspline/chart.cpp')
| -rw-r--r-- | examples/charts/dynamicspline/chart.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/charts/dynamicspline/chart.cpp b/examples/charts/dynamicspline/chart.cpp index 9f33423c..ee7061d2 100644 --- a/examples/charts/dynamicspline/chart.cpp +++ b/examples/charts/dynamicspline/chart.cpp @@ -42,7 +42,7 @@ Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags): m_x(5), m_y(1) { - QObject::connect(&m_timer, SIGNAL(timeout()), this, SLOT(handleTimeout())); + QObject::connect(&m_timer, &QTimer::timeout, this, &Chart::handleTimeout); m_timer.setInterval(1000); m_series = new QSplineSeries(this); |