From e789a35321487ae447f38395ea4dd2999aecfff3 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Feb 2014 12:14:31 +0200 Subject: Document metatype registration in qmloscilloscope MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie20a1cf7259a95967ebdb4b4a669851756366452 Reviewed-by: Tomi Korpipää --- examples/datavisualization/qmloscilloscope/datasource.cpp | 4 ++++ .../qmloscilloscope/doc/src/qmloscilloscope.qdoc | 8 ++++++++ 2 files changed, 12 insertions(+) (limited to 'examples') diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp index c9993a6b..8b10bcc7 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.cpp +++ b/examples/datavisualization/qmloscilloscope/datasource.cpp @@ -21,16 +21,20 @@ using namespace QtDataVisualization; +//! [3] Q_DECLARE_METATYPE(QSurface3DSeries *) Q_DECLARE_METATYPE(QValue3DAxis *) +//! [3] DataSource::DataSource(QObject *parent) : QObject(parent), m_index(-1), m_resetArray(0) { + //! [4] qRegisterMetaType(); qRegisterMetaType(); + //! [4] } DataSource::~DataSource() diff --git a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc index 13e50709..e5a84b86 100644 --- a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc +++ b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc @@ -69,6 +69,14 @@ \snippet qmloscilloscope/main.cpp 0 + To make it possible to use Qt Data Visualization class pointers as parameters on the + \c DataSource class methods on all environments and builds, we need to make sure the meta + types are registered: + + \snippet qmloscilloscope/datasource.cpp 3 + \dots 0 + \snippet qmloscilloscope/datasource.cpp 4 + \section1 QML In the QML codes, we define a Surface3D graph normally and give it a Surface3DSeries: -- cgit v1.2.3