diff options
| author | Jani Honkonen <jani.honkonen@digia.com> | 2012-11-22 15:04:39 +0200 |
|---|---|---|
| committer | Michal Klocek <Michal.Klocek@digia.com> | 2012-11-26 14:58:47 +0200 |
| commit | 3866e510c5143f819fb58030d70ea353c14bf4ec (patch) | |
| tree | 97283ed0de5841d248daeb682c293e3785c65bba /plugins | |
| parent | d036c2d29a38876526a46b34b40205c83aaa21c9 (diff) | |
Some fixes for Qt5, vs2010 build and qml
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/declarative/declarativechart.cpp | 5 | ||||
| -rw-r--r-- | plugins/declarative/declarativechart.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp index a69e8c8f..93d81586 100644 --- a/plugins/declarative/declarativechart.cpp +++ b/plugins/declarative/declarativechart.cpp @@ -248,13 +248,12 @@ DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent) connect(m_margins, SIGNAL(bottomChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int))); connect(m_margins, SIGNAL(leftChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int))); connect(m_margins, SIGNAL(rightChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int))); - connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,AbstractDomain*)), this, SLOT(handleSeriesAdded(QAbstractSeries*,AbstractDomain*))); + connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), this, SLOT(handleSeriesAdded(QAbstractSeries*))); connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SIGNAL(seriesRemoved(QAbstractSeries*))); } -void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series, AbstractDomain *domain) +void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series) { - Q_UNUSED(domain) emit seriesAdded(series); } diff --git a/plugins/declarative/declarativechart.h b/plugins/declarative/declarativechart.h index 59f0b726..8c2aa300 100644 --- a/plugins/declarative/declarativechart.h +++ b/plugins/declarative/declarativechart.h @@ -157,7 +157,7 @@ public Q_SLOTS: void changeMinimumMargins(int top, int bottom, int left, int right); void handleAxisXSet(QAbstractAxis *axis); void handleAxisYSet(QAbstractAxis *axis); - void handleSeriesAdded(QAbstractSeries *series, AbstractDomain *domain); + void handleSeriesAdded(QAbstractSeries *series); private: // Extending QChart with DeclarativeChart is not possible because QObject does not support |