Merge branch 'develop'v1.2.1

Change-Id: I58fa595eee1cf9ab934cb3187981355d6a856d05

1 files changed, 6 insertions, 3 deletions

diff --git a/tests/qmlperf/datagenerator.h b/tests/qmlperf/datagenerator.h
index c066d80c..ce7d235e 100644
--- a/tests/qmlperf/datagenerator.h
+++ b/tests/qmlperf/datagenerator.h
@@ -1,15 +1,15 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.io
+** For any questions to The Qt Company, please use contact form at http://qt.io
 **
 ** This file is part of the Qt Data Visualization module.
 **
 ** Licensees holding valid commercial license for Qt may use this file in
 ** accordance with the Qt License Agreement provided with the Software
 ** or, alternatively, in accordance with the terms contained in a written
-** agreement between you and Digia.
+** agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
 ** contact form at http://qt.io
@@ -20,6 +20,7 @@
 #define DATAGENERATOR_H
 
 #include <QtDataVisualization/QScatter3DSeries>
+#include <QtCore/QFile>
 
 using namespace QtDataVisualization;
 
@@ -33,9 +34,11 @@ public:
 public slots:
     void generateData(QScatter3DSeries *series, uint count);
     void add(QScatter3DSeries *series, uint count);
+    void writeLine(int itemCount, float fps);
 
 private:
     QScatter3DSeries m_series;
+    QFile *m_file;
 };
 
 #endif // DATAGENERATOR_H