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, 0 insertions, 220 deletions

diff --git a/tests/directional/scatterdatamodifier.cpp b/tests/directional/scatterdatamodifier.cpp
deleted file mode 100644
index 2746bdf1..00000000
--- a/tests/directional/scatterdatamodifier.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/******************************************************************************
-**
-** 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 "scatterdatamodifier.h"
-#include <QtDataVisualization/qscatterdataproxy.h>
-#include <QtDataVisualization/qvalue3daxis.h>
-#include <QtDataVisualization/q3dscene.h>
-#include <QtDataVisualization/q3dcamera.h>
-#include <QtDataVisualization/qscatter3dseries.h>
-#include <QtDataVisualization/q3dtheme.h>
-#include <qmath.h>
-#include <QComboBox>
-
-using namespace QtDataVisualization;
-
-const int numberOfCols = 8;
-const int numberOfRows = 8;
-const float limit = 8.0f;
-const float PI = 3.14159f;
-#define HEDGEHOG
-
-ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
-    : m_graph(scatter),
-      m_fontSize(40.0f),
-      m_style(QAbstract3DSeries::MeshUserDefined),
-      m_smooth(true)
-{
-    m_graph->activeTheme()->setType(Q3DTheme::ThemeEbony);
-    QFont font = m_graph->activeTheme()->font();
-    font.setPointSize(m_fontSize);
-    m_graph->activeTheme()->setFont(font);
-    m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow);
-    m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront);
-
-    m_graph->setAxisX(new QValue3DAxis);
-    m_graph->setAxisY(new QValue3DAxis);
-    m_graph->setAxisZ(new QValue3DAxis);
-
-    QScatterDataProxy *proxy = new QScatterDataProxy;
-    QScatter3DSeries *series = new QScatter3DSeries(proxy);
-    series->setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel");
-    m_graph->addSeries(series);
-
-    QObject::connect(&m_rotationTimer, &QTimer::timeout, this,
-                     &ScatterDataModifier::triggerRotation);
-
-    addData();
-}
-
-ScatterDataModifier::~ScatterDataModifier()
-{
-    delete m_graph;
-}
-
-void ScatterDataModifier::addData()
-{
-    // Configure the axes according to the data
-    m_graph->axisX()->setTitle("X");
-    m_graph->axisY()->setTitle("Y");
-    m_graph->axisZ()->setTitle("Z");
-    m_graph->axisX()->setRange(-limit, limit);
-    m_graph->axisY()->setRange(-1.0f, 1.0f);
-    m_graph->axisZ()->setRange(-limit, limit);
-
-    QScatterDataArray *dataArray = new QScatterDataArray;
-    dataArray->resize(numberOfCols * numberOfRows);
-    QScatterDataItem *ptrToDataArray = &dataArray->first();
-
-    float angleStep = 360.0f / float(numberOfCols);
-    float latAngleStep = 100.0f / float(numberOfRows);
-
-    for (float i = 0; i < numberOfRows; i++) {
-        float latAngle = float(i) * latAngleStep + 40.0f;
-        float radius = qSin(latAngle * PI / 180.0f) * limit;
-        float y = qCos(latAngle * PI / 180.0f) * 1.0f;
-#ifdef HEDGEHOG
-        float angleZ = (qAtan((y * limit / 2.0f) / radius) * 180.0f / PI);
-        QQuaternion rotationZ = QQuaternion::fromAxisAndAngle(QVector3D(0.0f, 0.0f, 1.0f), angleZ - 90.0f);
-#endif
-        for (float j = 0; j < numberOfCols; j++) {
-            float angle = float(j) * angleStep;
-            float x = qCos(angle * PI / 180.0f) * radius;
-            float z = qSin(angle * PI / 180.0f) * radius;
-
-            float angleY = (qAtan(z / x) * 180.0f / PI);
-            if (x < 0)
-                angleY = 180.0f + angleY;
-            if (x > 0 && z < 0)
-                angleY = 360.0f + angleY;
-#ifdef HEDGEHOG
-            QQuaternion rotationY = QQuaternion::fromAxisAndAngle(QVector3D(0.0f, 1.0f, 0.0f), angleY);
-            QQuaternion rotation = rotationY * rotationZ;
-#else
-            QQuaternion rotation = QQuaternion::fromAxisAndAngle(QVector3D(0.0f, 1.0f, 0.0f), angleY) *
-                QQuaternion::fromAxisAndAngle(QVector3D(1.0f, 0.0f, 0.0f), -90.0f);
-#endif
-
-            ptrToDataArray->setPosition(QVector3D(x, y, z));
-            ptrToDataArray->setRotation(rotation);
-            ptrToDataArray++;
-        }
-    }
-
-    m_graph->seriesList().at(0)->dataProxy()->resetArray(dataArray);
-}
-
-void ScatterDataModifier::enableOptimization(int enabled)
-{
-    if (enabled)
-        m_graph->setOptimizationHints(QAbstract3DGraph::OptimizationStatic);
-    else
-        m_graph->setOptimizationHints(QAbstract3DGraph::OptimizationDefault);
-}
-
-void ScatterDataModifier::changeStyle(int style)
-{
-    QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
-    if (comboBox) {
-        m_style = QAbstract3DSeries::Mesh(comboBox->itemData(style).toInt());
-        if (m_graph->seriesList().size())
-            m_graph->seriesList().at(0)->setMesh(m_style);
-    }
-}
-
-void ScatterDataModifier::changeTheme(int theme)
-{
-    Q3DTheme *currentTheme = m_graph->activeTheme();
-    currentTheme->setType(Q3DTheme::Theme(theme));
-    emit backgroundEnabledChanged(currentTheme->isBackgroundEnabled());
-    emit gridEnabledChanged(currentTheme->isGridEnabled());
-    emit fontChanged(currentTheme->font());
-}
-
-void ScatterDataModifier::changePresetCamera()
-{
-    static int preset = Q3DCamera::CameraPresetFrontLow;
-
-    m_graph->scene()->activeCamera()->setCameraPreset((Q3DCamera::CameraPreset)preset);
-
-    if (++preset > Q3DCamera::CameraPresetDirectlyBelow)
-        preset = Q3DCamera::CameraPresetFrontLow;
-}
-
-void ScatterDataModifier::changeLabelStyle()
-{
-    m_graph->activeTheme()->setLabelBackgroundEnabled(!m_graph->activeTheme()->isLabelBackgroundEnabled());
-}
-
-void ScatterDataModifier::changeFont(const QFont &font)
-{
-    QFont newFont = font;
-    newFont.setPointSizeF(m_fontSize);
-    m_graph->activeTheme()->setFont(newFont);
-}
-
-void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq)
-{
-    int quality = int(sq);
-    emit shadowQualityChanged(quality); // connected to a checkbox in main.cpp
-}
-
-void ScatterDataModifier::triggerRotation()
-{
-    if (m_graph->seriesList().size()) {
-        int selectedIndex = m_graph->seriesList().at(0)->selectedItem();
-        if (selectedIndex != QScatter3DSeries::invalidSelectionIndex()) {
-            static float itemAngle = 0.0f;
-            QScatterDataItem item(*(m_graph->seriesList().at(0)->dataProxy()->itemAt(selectedIndex)));
-            QQuaternion itemRotation = QQuaternion::fromAxisAndAngle(0.0f, 0.0f, 1.0f, itemAngle++);
-            item.setRotation(itemRotation);
-            m_graph->seriesList().at(0)->dataProxy()->setItem(selectedIndex, item);
-        } else {
-            static float seriesAngle = 0.0f;
-            QQuaternion rotation = QQuaternion::fromAxisAndAngle(1.0f, 1.0f, 1.0f, seriesAngle++);
-            m_graph->seriesList().at(0)->setMeshRotation(rotation);
-        }
-    }
-}
-
-void ScatterDataModifier::changeShadowQuality(int quality)
-{
-    QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality);
-    m_graph->setShadowQuality(sq);
-}
-
-void ScatterDataModifier::setBackgroundEnabled(int enabled)
-{
-    m_graph->activeTheme()->setBackgroundEnabled((bool)enabled);
-}
-
-void ScatterDataModifier::setGridEnabled(int enabled)
-{
-    m_graph->activeTheme()->setGridEnabled((bool)enabled);
-}
-
-void ScatterDataModifier::toggleRotation()
-{
-    if (m_rotationTimer.isActive())
-        m_rotationTimer.stop();
-    else
-        m_rotationTimer.start(20);
-}