diff options
| author | Titta Heikkala <titta.heikkala@digia.com> | 2014-06-03 15:21:33 +0300 |
|---|---|---|
| committer | Titta Heikkala <titta.heikkala@digia.com> | 2014-06-04 10:03:21 +0300 |
| commit | 638297e957ee79d15c04c09d0b48dc485a3c8c7a (patch) | |
| tree | 54589e3b754bc91d119c97e4a99ac9d4796b92ce | |
| parent | 57eb7a33024554bba51adf8c152a09a44bf7e9a4 (diff) | |
Fix axes issues with oscilloscope demos
The metatype declarations for QAbstractAxis are added to the
oscilloscope demo applications for them to recognize the axis type
correctly.
Task-number: QTRD-3162
Change-Id: I6aadb97d8191bcab6b92a3833dc8c44a1ab79cee
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| -rw-r--r-- | demos/qmloscilloscope/datasource.cpp | 2 | ||||
| -rw-r--r-- | demos/quick2oscilloscope/datasource.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/demos/qmloscilloscope/datasource.cpp b/demos/qmloscilloscope/datasource.cpp index dfeba541..35285778 100644 --- a/demos/qmloscilloscope/datasource.cpp +++ b/demos/qmloscilloscope/datasource.cpp @@ -28,6 +28,7 @@ QTCOMMERCIALCHART_USE_NAMESPACE Q_DECLARE_METATYPE(QAbstractSeries *) +Q_DECLARE_METATYPE(QAbstractAxis *) DataSource::DataSource(QDeclarativeView *appViewer, QObject *parent) : QObject(parent), @@ -35,6 +36,7 @@ DataSource::DataSource(QDeclarativeView *appViewer, QObject *parent) : m_index(-1) { qRegisterMetaType<QAbstractSeries*>(); + qRegisterMetaType<QAbstractAxis*>(); generateData(0, 5, 1024); } diff --git a/demos/quick2oscilloscope/datasource.cpp b/demos/quick2oscilloscope/datasource.cpp index 86de2e71..48b2ecfb 100644 --- a/demos/quick2oscilloscope/datasource.cpp +++ b/demos/quick2oscilloscope/datasource.cpp @@ -29,6 +29,7 @@ QTCOMMERCIALCHART_USE_NAMESPACE Q_DECLARE_METATYPE(QAbstractSeries *) +Q_DECLARE_METATYPE(QAbstractAxis *) DataSource::DataSource(QQuickView *appViewer, QObject *parent) : QObject(parent), @@ -36,6 +37,7 @@ DataSource::DataSource(QQuickView *appViewer, QObject *parent) : m_index(-1) { qRegisterMetaType<QAbstractSeries*>(); + qRegisterMetaType<QAbstractAxis*>(); generateData(0, 5, 1024); } |