Fix issues with COIN builds

-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL

Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>

1 files changed, 89 insertions, 0 deletions

diff --git a/tests/manual/qmlperf/datagenerator.cpp b/tests/manual/qmlperf/datagenerator.cpp
new file mode 100644
index 00000000..265b78ee
--- /dev/null
+++ b/tests/manual/qmlperf/datagenerator.cpp
@@ -0,0 +1,89 @@
+/******************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Data Visualization module.
+**
+** $QT_BEGIN_LICENSE:COMM$
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** $QT_END_LICENSE$
+**
+******************************************************************************/
+
+#include "datagenerator.h"
+#include <QDebug>
+
+using namespace QtDataVisualization;
+
+Q_DECLARE_METATYPE(QScatter3DSeries *)
+
+DataGenerator::DataGenerator(QObject *parent) :
+    QObject(parent)
+{
+    qRegisterMetaType<QScatter3DSeries *>();
+
+    m_file = new QFile("results.txt");
+    if (!m_file->open(QIODevice::WriteOnly | QIODevice::Text)) {
+        delete m_file;
+        m_file = 0;
+    }
+}
+
+DataGenerator::~DataGenerator()
+{
+    m_file->close();
+    delete m_file;
+}
+
+void DataGenerator::generateData(QScatter3DSeries *series, uint count)
+{
+    QScatterDataArray *dataArray = new QScatterDataArray;
+    dataArray->resize(count);
+    QScatterDataItem *ptrToDataArray = &dataArray->first();
+
+    float rand_max = float(RAND_MAX);
+    for (uint i = 0; i < count; i++) {
+            ptrToDataArray->setPosition(QVector3D(float(qrand()) / rand_max,
+                                                  float(qrand()) / rand_max,
+                                                  float(qrand()) / rand_max));
+            ptrToDataArray++;
+    }
+
+    series->dataProxy()->resetArray(dataArray);
+}
+
+void DataGenerator::add(QScatter3DSeries *series, uint count)
+{
+    QScatterDataArray appendArray;
+    appendArray.resize(count);
+
+    float rand_max = float(RAND_MAX);
+    for (uint i = 0; i < count; i++) {
+            appendArray[i].setPosition(QVector3D(float(qrand()) / rand_max,
+                                                 float(qrand()) / rand_max,
+                                                 float(qrand()) / rand_max));
+    }
+
+    series->dataProxy()->addItems(appendArray);
+}
+
+void DataGenerator::writeLine(int itemCount, float fps)
+{
+    if (m_file) {
+        QTextStream out(m_file);
+
+        QString fpsFormatString(QStringLiteral("%1   %2\n"));
+        QString fpsString = fpsFormatString.arg(itemCount).arg(fps);
+
+        out << fpsString;
+    }
+}