diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-09-14 10:47:08 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-09-14 11:11:51 +0300 |
| commit | d1e65f10217f51f81935df90129f82217d3648ed (patch) | |
| tree | d9c37ee021008b497609816045d91f6cdde09231 /examples/datavisualization/qmloscilloscope | |
| parent | 5ba7f70d0d94de720d49b37b2d257b51b9afd026 (diff) | |
| parent | dc6dcf918bcf4f350ab92ab659506b4a0f8d80f6 (diff) | |
Merge branch 'develop'
Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce
Diffstat (limited to 'examples/datavisualization/qmloscilloscope')
| -rw-r--r-- | examples/datavisualization/qmloscilloscope/datasource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h index 03dcc510..667c78aa 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.h +++ b/examples/datavisualization/qmloscilloscope/datasource.h @@ -31,7 +31,7 @@ public: virtual ~DataSource(); //! [0] -public slots: +public Q_SLOTS: void generateData(int cacheCount, int rowCount, int columnCount, float xMin, float xMax, float yMin, float yMax, float zMin, float zMax); |