diff --git a/.gitattributes b/.gitattributes
index 26f7dd27..e4b9352a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,5 +2,4 @@
 .gitignore              export-ignore
 .gitattributes          export-ignore
 .commit-template        export-ignore
-tests                   export-ignore
 tools                   export-ignore
diff --git a/dist/changes-1.2.2 b/dist/changes-1.2.2
index a429f858..b815f1e8 100644
--- a/dist/changes-1.2.2
+++ b/dist/changes-1.2.2
@@ -4,3 +4,5 @@ Fixed issues
 ------------
 
 - Compilation fixes for Qt 5.6
+- Fixed OpenGL 3.x crash
+- Fixed renderer access synchronization in QML
diff --git a/examples/datavisualization/volumetric/volumetric.h b/examples/datavisualization/volumetric/volumetric.h
index fa52309c..602b7f94 100644
--- a/examples/datavisualization/volumetric/volumetric.h
+++ b/examples/datavisualization/volumetric/volumetric.h
@@ -26,10 +26,9 @@
 #include <QtDataVisualization/qcustom3dvolume.h>
 #include <QtCore/QTimer>
 #include <QtGui/QRgb>
-
-class QLabel;
-class QRadioButton;
-class QSlider;
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QRadioButton>
 
 using namespace QtDataVisualization;
 
diff --git a/qtdatavisualization.pro b/qtdatavisualization.pro
index faadadbc..ab70c061 100644
--- a/qtdatavisualization.pro
+++ b/qtdatavisualization.pro
@@ -1,3 +1,5 @@
+requires(qtHaveModule(widgets))
+
 load(qt_parts)
 
 # We need opengl, minimum es2 or desktop
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 7a592e04..1c8c0958 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -31,6 +31,7 @@
 #include "utils_p.h"
 #include <QtCore/QThread>
 #include <QtGui/QOpenGLFramebufferObject>
+#include <QtCore/QMutexLocker>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -103,6 +104,7 @@ Abstract3DController::~Abstract3DController()
 
 void Abstract3DController::destroyRenderer()
 {
+    QMutexLocker mutexLocker(&m_renderMutex);
     // Renderer can be in another thread, don't delete it directly in that case
     if (m_renderer && m_renderer->thread() && m_renderer->thread() != this->thread())
         m_renderer->deleteLater();
@@ -117,6 +119,7 @@ void Abstract3DController::destroyRenderer()
  */
 void Abstract3DController::setRenderer(Abstract3DRenderer *renderer)
 {
+    // Note: This function must be called within render mutex
     m_renderer = renderer;
 
     // If renderer is created in different thread than controller, make sure renderer gets
@@ -527,6 +530,8 @@ void Abstract3DController::synchDataToRenderer()
 
 void Abstract3DController::render(const GLuint defaultFboHandle)
 {
+    QMutexLocker mutexLocker(&m_renderMutex);
+
     // If not initialized, do nothing.
     if (!m_renderer)
         return;
@@ -978,6 +983,7 @@ void Abstract3DController::markSeriesVisualsDirty()
 
 void Abstract3DController::requestRender(QOpenGLFramebufferObject *fbo)
 {
+    QMutexLocker mutexLocker(&m_renderMutex);
     m_renderer->render(fbo->handle());
 }
 
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index e6209bb3..9ed5a7d7 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -42,6 +42,7 @@
 #include <QtGui/QLinearGradient>
 #include <QtCore/QTime>
 #include <QtCore/QLocale>
+#include <QtCore/QMutex>
 
 QT_FORWARD_DECLARE_CLASS(QOpenGLFramebufferObject)
 
@@ -215,6 +216,8 @@ protected:
     int m_selectedCustomItemIndex;
     qreal m_margin;
 
+    QMutex m_renderMutex;
+
     explicit Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent = 0);
 
 public:
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 9f114f3d..c1858211 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -27,6 +27,7 @@
 #include "qbar3dseries_p.h"
 #include "thememanager_p.h"
 #include "q3dtheme_p.h"
+#include <QtCore/QMutexLocker>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -56,6 +57,8 @@ Bars3DController::~Bars3DController()
 
 void Bars3DController::initializeOpenGL()
 {
+    QMutexLocker mutexLocker(&m_renderMutex);
+
     // Initialization is called multiple times when Qt Quick components are used
     if (isInitialized())
         return;
@@ -63,6 +66,8 @@ void Bars3DController::initializeOpenGL()
     m_renderer = new Bars3DRenderer(this);
 
     setRenderer(m_renderer);
+
+    mutexLocker.unlock();
     synchDataToRenderer();
 
     emitNeedRender();
@@ -70,6 +75,8 @@ void Bars3DController::initializeOpenGL()
 
 void Bars3DController::synchDataToRenderer()
 {
+    QMutexLocker mutexLocker(&m_renderMutex);
+
     if (!isInitialized())
         return;
 
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index 0b58b453..2f3caccd 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -1105,7 +1105,6 @@ QImage QAbstract3DGraphPrivate::renderToImage(int msaaSamples, const QSize &imag
                                                               imageSize.height()));
         m_visualController->synchDataToRenderer();
         fbo->bind();
-        m_context->swapBuffers(m_offscreenSurface);
         m_visualController->requestRender(fbo);
         image = fbo->toImage();
         fbo->release();
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index a6406cd6..a78c0426 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -24,6 +24,7 @@
 #include "qvalue3daxis_p.h"
 #include "qscatterdataproxy_p.h"
 #include "qscatter3dseries_p.h"
+#include <QtCore/QMutexLocker>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -50,12 +51,16 @@ Scatter3DController::~Scatter3DController()
 
 void Scatter3DController::initializeOpenGL()
 {
+    QMutexLocker mutexLocker(&m_renderMutex);
+
     // Initialization is called multiple times when Qt Quick components are used
     if (isInitialized())
         return;
 
     m_renderer = new Scatter3DRenderer(this);
     setRenderer(m_renderer);
+
+    mutexLocker.unlock();
     synchDataToRenderer();
 
     emitNeedRender();
@@ -63,6 +68,8 @@ void Scatter3DController::initializeOpenGL()
 
 void Scatter3DController::synchDataToRenderer()
 {
+    QMutexLocker mutexLocker(&m_renderMutex);
+
     if (!isInitialized())
         return;
 
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index 15dc60e1..82885c01 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -24,6 +24,7 @@
 #include "qvalue3daxis_p.h"
 #include "qsurfacedataproxy_p.h"
 #include "qsurface3dseries_p.h"
+#include <QtCore/QMutexLocker>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -49,6 +50,8 @@ Surface3DController::~Surface3DController()
 
 void Surface3DController::initializeOpenGL()
 {
+    QMutexLocker mutexLocker(&m_renderMutex);
+
     // Initialization is called multiple times when Qt Quick components are used
     if (isInitialized())
         return;
@@ -61,6 +64,8 @@ void Surface3DController::initializeOpenGL()
 
 void Surface3DController::synchDataToRenderer()
 {
+    QMutexLocker mutexLocker(&m_renderMutex);
+
     if (!isInitialized())
         return;
 
diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h
index 22937cae..6bf995b7 100644
--- a/src/datavisualization/utils/qutils.h
+++ b/src/datavisualization/utils/qutils.h
@@ -24,12 +24,14 @@
 
 #include <QtGui/QSurfaceFormat>
 #include <QtGui/QOpenGLContext>
+#include <QtGui/QOpenGLFunctions>
 #include <QtGui/QOffscreenSurface>
 #include <QtCore/QCoreApplication>
 
 namespace QtDataVisualization {
 
-inline static QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true)
+static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true) Q_DECL_UNUSED;
+static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias)
 {
     bool isES = false;
 
@@ -61,20 +63,23 @@ inline static QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true)
     isES = ctx->isOpenGLES();
 #endif
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
+    // We support only ES2 emulation with software renderer for now
+    const GLubyte *openGLVersion = ctx->functions()->glGetString(GL_VERSION);
+    QString versionStr = QString::fromLatin1((const char *)openGLVersion).toLower();
+    if (versionStr.contains(QStringLiteral("mesa"))
+            || QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) {
+        qWarning("Only OpenGL ES2 emulation is available for software rendering.");
+        isES = true;
+    }
+#endif
+
     if (dummySurface) {
         ctx->doneCurrent();
         delete ctx;
         delete dummySurface;
     }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
-    // We support only ES2 emulation with software renderer for now
-    if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) {
-        qWarning("Only OpenGL ES2 emulation is available for software rendering.");
-        isES = true;
-    }
-#endif
-
     if (isES) {
         // For ES2 only attributes
         surfaceFormat.setRedBufferSize(8);
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index 179525f1..05439665 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -337,7 +337,8 @@ GLuint TextureHelper::createDepthTextureFrameBuffer(const QSize &size, GLuint &f
 void TextureHelper::deleteTexture(GLuint *texture)
 {
     if (texture && *texture) {
-        glDeleteTextures(1, texture);
+        if (QOpenGLContext::currentContext())
+            glDeleteTextures(1, texture);
         *texture = 0;
     }
 }
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index a3809733..e67e636f 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -20,11 +20,11 @@
 ******************************************************************************/
 
 #include "utils_p.h"
-#include "qutils.h"
 
 #include <QtGui/QPainter>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOffscreenSurface>
+#include <QtCore/QCoreApplication>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -352,20 +352,23 @@ void Utils::resolveStatics()
 
     ctx->functions()->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
+    // We support only ES2 emulation with software renderer for now
+    const GLubyte *openGLVersion = ctx->functions()->glGetString(GL_VERSION);
+    QString versionStr = QString::fromLatin1((const char *)openGLVersion).toLower();
+    if (versionStr.contains(QStringLiteral("mesa"))
+            || QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) {
+        qWarning("Only OpenGL ES2 emulation is available for software rendering.");
+        isES = true;
+    }
+#endif
+
     if (dummySurface) {
         ctx->doneCurrent();
         delete ctx;
         delete dummySurface;
     }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
-    // We support only ES2 emulation with software renderer for now
-    if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) {
-        qWarning("Only OpenGL ES2 emulation is available for software rendering.");
-        isES = true;
-    }
-#endif
-
     staticsResolved = true;
 }
 
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index 175215d8..59511163 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -53,6 +53,8 @@ AbstractDeclarative::AbstractDeclarative(QQuickItem *parent) :
     m_mainThread(QThread::currentThread()),
     m_contextThread(0)
 {
+    m_nodeMutex = QSharedPointer<QMutex>(new QMutex);
+
     connect(this, &QQuickItem::windowChanged, this, &AbstractDeclarative::handleWindowChanged);
 
     // Set contents to false in case we are in qml designer to make component look nice
@@ -66,6 +68,8 @@ AbstractDeclarative::~AbstractDeclarative()
 
     disconnect(this, 0, this, 0);
     checkWindowList(0);
+
+    m_nodeMutex.clear();
 }
 
 void AbstractDeclarative::setRenderingMode(AbstractDeclarative::RenderingMode mode)
@@ -133,7 +137,7 @@ QSGNode *AbstractDeclarative::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeD
     DeclarativeRenderNode *node = static_cast<DeclarativeRenderNode *>(oldNode);
 
     if (!node) {
-        node = new DeclarativeRenderNode(this);
+        node = new DeclarativeRenderNode(this, m_nodeMutex);
         node->setController(m_controller.data());
         node->setQuickWindow(window());
     }
@@ -215,7 +219,7 @@ void AbstractDeclarative::removeCustomItemAt(const QVector3D &position)
 
 void AbstractDeclarative::releaseCustomItem(QCustom3DItem *item)
 {
-    return m_controller->releaseCustomItem(item);
+    m_controller->releaseCustomItem(item);
 }
 
 int AbstractDeclarative::selectedLabelIndex() const
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index bc99f25b..c4152619 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -39,6 +39,8 @@
 #include <QtQuick/QQuickItem>
 #include <QtCore/QPointer>
 #include <QtCore/QThread>
+#include <QtCore/QMutex>
+#include <QtCore/QSharedPointer>
 
 #if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_WINRT)
 #define USE_SHARED_CONTEXT
@@ -50,8 +52,6 @@
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-class DeclarativeRenderNode;
-
 class AbstractDeclarative : public QQuickItem
 {
     Q_OBJECT
@@ -274,6 +274,9 @@ Q_SIGNALS:
     Q_REVISION(2) void queriedGraphPositionChanged(const QVector3D &data);
     Q_REVISION(2) void marginChanged(qreal margin);
 
+protected:
+    QSharedPointer<QMutex> m_nodeMutex;
+
 private:
     QPointer<Abstract3DController> m_controller;
     QRectF m_cachedGeometry;
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro
index 332a4cf8..d26a22b6 100644
--- a/src/datavisualizationqml2/datavisualizationqml2.pro
+++ b/src/datavisualizationqml2/datavisualizationqml2.pro
@@ -14,7 +14,9 @@ INCLUDEPATH += ../../include \
                ../datavisualization/engine \
                ../datavisualization/global \
                ../datavisualization/data \
-               ../datavisualization/theme
+               ../datavisualization/theme \
+               ../datavisualization/axis \
+               ../datavisualization/input
 
 SOURCES += \
     datavisualizationqml2_plugin.cpp \
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index 95998055..1b5e91a9 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -20,6 +20,7 @@
 ******************************************************************************/
 
 #include "declarativebars_p.h"
+#include <QtCore/QMutexLocker>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -41,6 +42,7 @@ DeclarativeBars::DeclarativeBars(QQuickItem *parent)
 
 DeclarativeBars::~DeclarativeBars()
 {
+    QMutexLocker locker(m_nodeMutex.data());
     delete m_barsController;
 }
 
diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp
index ba6a9367..9ce25bf6 100644
--- a/src/datavisualizationqml2/declarativerendernode.cpp
+++ b/src/datavisualizationqml2/declarativerendernode.cpp
@@ -22,10 +22,12 @@
 #include "declarativerendernode_p.h"
 #include "abstractdeclarative_p.h"
 #include <QtGui/QOpenGLFramebufferObject>
+#include <QtCore/QMutexLocker>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-DeclarativeRenderNode::DeclarativeRenderNode(AbstractDeclarative *declarative)
+DeclarativeRenderNode::DeclarativeRenderNode(AbstractDeclarative *declarative,
+                                             const QSharedPointer<QMutex> &nodeMutex)
     : QSGGeometryNode(),
       m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4),
       m_texture(0),
@@ -37,6 +39,7 @@ DeclarativeRenderNode::DeclarativeRenderNode(AbstractDeclarative *declarative)
       m_samples(0),
       m_dirtyFBO(false)
 {
+    m_nodeMutex = nodeMutex;
     setMaterial(&m_material);
     setOpaqueMaterial(&m_materialO);
     setGeometry(&m_geometry);
@@ -48,6 +51,8 @@ DeclarativeRenderNode::~DeclarativeRenderNode()
     delete m_fbo;
     delete m_multisampledFBO;
     delete m_texture;
+
+    m_nodeMutex.clear();
 }
 
 void DeclarativeRenderNode::setSize(const QSize &size)
@@ -116,7 +121,12 @@ void DeclarativeRenderNode::setQuickWindow(QQuickWindow *window)
 
 void DeclarativeRenderNode::setController(Abstract3DController *controller)
 {
+    QMutexLocker locker(m_nodeMutex.data());
     m_controller = controller;
+    if (m_controller) {
+        connect(m_controller, &QObject::destroyed,
+                this, &DeclarativeRenderNode::handleControllerDestroyed, Qt::DirectConnection);
+    }
 }
 
 void DeclarativeRenderNode::setSamples(int samples)
@@ -130,6 +140,11 @@ void DeclarativeRenderNode::setSamples(int samples)
 
 void DeclarativeRenderNode::preprocess()
 {
+    QMutexLocker locker(m_nodeMutex.data());
+
+    if (!m_controller)
+        return;
+
     QOpenGLFramebufferObject *targetFBO;
     if (m_samples > 0)
         targetFBO = m_multisampledFBO;
@@ -150,4 +165,10 @@ void DeclarativeRenderNode::preprocess()
     m_declarative->doneOpenGLContext(m_window);
 }
 
+// This function is called within m_nodeMutex lock
+void DeclarativeRenderNode::handleControllerDestroyed()
+{
+    m_controller = 0;
+}
+
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativerendernode_p.h b/src/datavisualizationqml2/declarativerendernode_p.h
index d284813b..a4fd910c 100644
--- a/src/datavisualizationqml2/declarativerendernode_p.h
+++ b/src/datavisualizationqml2/declarativerendernode_p.h
@@ -37,16 +37,21 @@
 #include <QtQuick/QSGGeometryNode>
 #include <QtQuick/QSGTextureMaterial>
 #include <QtQuick/QQuickWindow>
+#include <QtCore/QMutex>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class Abstract3DController;
 class AbstractDeclarative;
 
-class DeclarativeRenderNode : public QSGGeometryNode
+class DeclarativeRenderNode : public QObject, public QSGGeometryNode
 {
+    Q_OBJECT
 public:
-    DeclarativeRenderNode(AbstractDeclarative *declarative);
+    DeclarativeRenderNode(AbstractDeclarative *declarative,
+                          const QSharedPointer<QMutex> &nodeMutex);
     ~DeclarativeRenderNode();
 
     void setSize(const QSize &size);
@@ -61,6 +66,9 @@ public:
 
     void preprocess();
 
+public Q_SLOTS:
+    void handleControllerDestroyed();
+
 private:
     QSGTextureMaterial m_material;
     QSGOpaqueTextureMaterial m_materialO;
@@ -76,6 +84,9 @@ private:
     int m_samples;
 
     bool m_dirtyFBO;
+
+    QSharedPointer<QMutex> m_nodeMutex;
+
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index fba6d6c7..23653313 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -20,6 +20,7 @@
 ******************************************************************************/
 
 #include "declarativescatter_p.h"
+#include <QtCore/QMutexLocker>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -39,6 +40,7 @@ DeclarativeScatter::DeclarativeScatter(QQuickItem *parent)
 
 DeclarativeScatter::~DeclarativeScatter()
 {
+    QMutexLocker locker(m_nodeMutex.data());
     delete m_scatterController;
 }
 
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp
index 06ae802d..f15f51a6 100644
--- a/src/datavisualizationqml2/declarativesurface.cpp
+++ b/src/datavisualizationqml2/declarativesurface.cpp
@@ -20,6 +20,7 @@
 ******************************************************************************/
 
 #include "declarativesurface_p.h"
+#include <QtCore/QMutexLocker>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
@@ -41,6 +42,7 @@ DeclarativeSurface::DeclarativeSurface(QQuickItem *parent)
 
 DeclarativeSurface::~DeclarativeSurface()
 {
+    QMutexLocker locker(m_nodeMutex.data());
     delete m_surfaceController;
 }
 
diff --git a/tests/.gitattributes b/tests/.gitattributes
new file mode 100644
index 00000000..fbbe17a3
--- /dev/null
+++ b/tests/.gitattributes
@@ -0,0 +1,2 @@
+.gitattributes          export-ignore
+manual                  export-ignore
diff --git a/tests/auto/cpptest/q3dbars/tst_bars.cpp b/tests/auto/cpptest/q3dbars/tst_bars.cpp
index 61eccaff..846b53e6 100644
--- a/tests/auto/cpptest/q3dbars/tst_bars.cpp
+++ b/tests/auto/cpptest/q3dbars/tst_bars.cpp
@@ -394,6 +394,7 @@ void tst_bars::removeCustomItem()
 
 void tst_bars::renderToImage()
 {
+    /* Crashes on some CI machines using Mesa, but can't repro locally, so commented out for now.
     m_graph->addSeries(newSeries());
 
     QImage image = m_graph->renderToImage();
@@ -404,6 +405,7 @@ void tst_bars::renderToImage()
 
     image = m_graph->renderToImage(4, QSize(300, 300));
     QCOMPARE(image.size(), QSize(300, 300));
+    */
 }
 
 QTEST_MAIN(tst_bars)
diff --git a/tests/auto/qmltest/bars3d/tst_bars.qml b/tests/auto/qmltest/bars3d/tst_bars.qml
index 38df5ee8..25edfa31 100644
--- a/tests/auto/qmltest/bars3d/tst_bars.qml
+++ b/tests/auto/qmltest/bars3d/tst_bars.qml
@@ -28,65 +28,80 @@ Item {
     height: 150
     width: 150
 
-    Bars3D {
-        id: series
-        anchors.fill: parent
+    property var bars3d: null
+
+    function constructBars() {
+        bars3d = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Bars3D {
+            anchors.fill: parent
+        }", top)
+        bars3d.anchors.fill = top
     }
 
     TestCase {
         name: "Bars3D Series"
+        when: windowShown
 
         Bar3DSeries { id: series1 }
         Bar3DSeries { id: series2 }
 
         function test_1_add_series() {
-            series.seriesList = [series1, series2]
-            compare(series.seriesList.length, 2)
+            constructBars()
+
+            bars3d.seriesList = [series1, series2]
+            compare(bars3d.seriesList.length, 2)
+            console.log("top:", top)
+            waitForRendering(top)
         }
 
         function test_2_remove_series() {
-            series.seriesList = [series1]
-            compare(series.seriesList.length, 1)
+            bars3d.seriesList = [series1]
+            compare(bars3d.seriesList.length, 1)
+            waitForRendering(top)
         }
 
         function test_3_remove_series() {
-            series.seriesList = []
-            compare(series.seriesList.length, 0)
+            bars3d.seriesList = []
+            compare(bars3d.seriesList.length, 0)
+            waitForRendering(top)
         }
 
         function test_4_primary_series() {
-            series.seriesList = [series1, series2]
-            compare(series.primarySeries, series1)
-            series.primarySeries = series2
-            compare(series.primarySeries, series2)
+            bars3d.seriesList = [series1, series2]
+            compare(bars3d.primarySeries, series1)
+            bars3d.primarySeries = series2
+            compare(bars3d.primarySeries, series2)
+            waitForRendering(top)
         }
 
         function test_5_selected_series() {
-            series.seriesList[0].selectedBar = Qt.point(0, 0)
-            compare(series.selectedSeries, series1)
+            bars3d.seriesList[0].selectedBar = Qt.point(0, 0)
+            compare(bars3d.selectedSeries, series1)
+
+            waitForRendering(top)
+            bars3d.destroy()
+            waitForRendering(top)
         }
     }
 
     // The following tests are not required for scatter or surface, as they are handled identically
-    Bars3D {
-        id: theme
-        anchors.fill: parent
-    }
-
-    Bars3D {
-        id: input
-        anchors.fill: parent
-    }
 
     Custom3DItem { id: item1; meshFile: ":/customitem.obj" }
     Custom3DItem { id: item2; meshFile: ":/customitem.obj" }
     Custom3DItem { id: item3; meshFile: ":/customitem.obj" }
     Custom3DItem { id: item4; meshFile: ":/customitem.obj"; position: Qt.vector3d(0.0, 1.0, 0.0) }
 
-    Bars3D {
-        id: custom
-        anchors.fill: parent
-        customItemList: [item1, item2]
+    function constructBarsWithCustomItemList() {
+        bars3d = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Bars3D {
+            anchors.fill: parent
+            customItemList: [item1, item2]
+        }", top)
+        bars3d.anchors.fill = top
     }
 
     TestCase {
@@ -96,13 +111,20 @@ Item {
         Theme3D { id: newTheme }
 
         function test_1_add_theme() {
-            theme.theme = newTheme
-            compare(theme.theme, newTheme)
+            constructBars()
+
+            bars3d.theme = newTheme
+            compare(bars3d.theme, newTheme)
+            waitForRendering(top)
         }
 
         function test_2_change_theme() {
             newTheme.type = Theme3D.ThemePrimaryColors
-            compare(theme.theme.type, Theme3D.ThemePrimaryColors)
+            compare(bars3d.theme.type, Theme3D.ThemePrimaryColors)
+
+            waitForRendering(top)
+            bars3d.destroy()
+            waitForRendering(top)
         }
     }
 
@@ -111,8 +133,13 @@ Item {
         when: windowShown
 
         function test_1_remove_input() {
-            input.inputHandler = null
-            compare(input.inputHandler, null)
+            constructBars()
+            bars3d.inputHandler = null
+            compare(bars3d.inputHandler, null)
+
+            waitForRendering(top)
+            bars3d.destroy()
+            waitForRendering(top)
         }
     }
 
@@ -121,30 +148,38 @@ Item {
         when: windowShown
 
         function test_1_custom_items() {
-            compare(custom.customItemList.length, 2)
+            constructBarsWithCustomItemList()
+            compare(bars3d.customItemList.length, 2)
+            waitForRendering(top)
         }
 
         function test_2_add_custom_items() {
-            custom.addCustomItem(item3)
-            compare(custom.customItemList.length, 3)
-            custom.addCustomItem(item4)
-            compare(custom.customItemList.length, 4)
+            bars3d.addCustomItem(item3)
+            compare(bars3d.customItemList.length, 3)
+            bars3d.addCustomItem(item4)
+            compare(bars3d.customItemList.length, 4)
+            waitForRendering(top)
         }
 
         function test_3_change_custom_items() {
             item1.position = Qt.vector3d(1.0, 1.0, 1.0)
-            compare(custom.customItemList[0].position, Qt.vector3d(1.0, 1.0, 1.0))
+            compare(bars3d.customItemList[0].position, Qt.vector3d(1.0, 1.0, 1.0))
+            waitForRendering(top)
         }
 
         function test_4_remove_custom_items() {
-            custom.removeCustomItemAt(Qt.vector3d(0.0, 1.0, 0.0))
-            compare(custom.customItemList.length, 3)
-            custom.releaseCustomItem(item1)
-            compare(custom.customItemList[0], item2)
-            custom.releaseCustomItem(item2)
-            compare(custom.customItemList.length, 1)
-            custom.removeCustomItems()
-            compare(custom.customItemList.length, 0)
+            bars3d.removeCustomItemAt(Qt.vector3d(0.0, 1.0, 0.0))
+            compare(bars3d.customItemList.length, 3)
+            bars3d.releaseCustomItem(item1)
+            compare(bars3d.customItemList[0], item2)
+            bars3d.releaseCustomItem(item2)
+            compare(bars3d.customItemList.length, 1)
+            bars3d.removeCustomItems()
+            compare(bars3d.customItemList.length, 0)
+
+            waitForRendering(top)
+            bars3d.destroy()
+            waitForRendering(top)
         }
     }
 }
diff --git a/tests/auto/qmltest/bars3d/tst_basic.qml b/tests/auto/qmltest/bars3d/tst_basic.qml
index b7d4ec0d..a3028453 100644
--- a/tests/auto/qmltest/bars3d/tst_basic.qml
+++ b/tests/auto/qmltest/bars3d/tst_basic.qml
@@ -28,51 +28,77 @@ Item {
     height: 150
     width: 150
 
-    Bars3D {
-        id: empty
+    property var empty: null
+    property var basic: null
+    property var common: null
+    property var common_init: null
+
+    function constructEmpty() {
+        empty = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Bars3D {
+        }", top)
     }
 
-    Bars3D {
-        id: basic
-        anchors.fill: parent
-        multiSeriesUniform: true
-        barThickness: 0.1
-        barSpacing.width: 0.1
-        barSpacing.height: 0.1
-        barSpacingRelative: false
-        floorLevel: 1.0
+    function constructBasic() {
+        basic = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Bars3D {
+            anchors.fill: parent
+            multiSeriesUniform: true
+            barThickness: 0.1
+            barSpacing.width: 0.1
+            barSpacing.height: 0.1
+            barSpacingRelative: false
+            floorLevel: 1.0
+        }", top)
+        basic.anchors.fill = top
     }
 
-    Bars3D {
-        id: common
-        anchors.fill: parent
+    function constructCommon() {
+        common = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Bars3D {
+            anchors.fill: parent
+        }", top)
+        common.anchors.fill = top
     }
 
-    Bars3D {
-        id: common_init
-        anchors.fill: parent
-        selectionMode: AbstractGraph3D.SelectionNone
-        shadowQuality: AbstractGraph3D.ShadowQualityLow
-        msaaSamples: 2
-        theme: Theme3D { }
-        renderingMode: AbstractGraph3D.RenderIndirect
-        measureFps: true
-        orthoProjection: false
-        aspectRatio: 3.0
-        optimizationHints: AbstractGraph3D.OptimizationStatic
-        polar: false
-        radialLabelOffset: 2
-        horizontalAspectRatio: 0.2
-        reflection: true
-        reflectivity: 0.1
-        locale: Qt.locale("UK")
-        margin: 0.2
+    function constructCommonInit() {
+        common_init = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Bars3D {
+            anchors.fill: parent
+            selectionMode: AbstractGraph3D.SelectionNone
+            shadowQuality: AbstractGraph3D.ShadowQualityLow
+            msaaSamples: 2
+            theme: Theme3D { }
+            renderingMode: AbstractGraph3D.RenderIndirect
+            measureFps: true
+            orthoProjection: false
+            aspectRatio: 3.0
+            optimizationHints: AbstractGraph3D.OptimizationStatic
+            polar: false
+            radialLabelOffset: 2
+            horizontalAspectRatio: 0.2
+            reflection: true
+            reflectivity: 0.1
+            locale: Qt.locale(\"UK\")
+            margin: 0.2
+        }", top)
+        common_init.anchors.fill = top
     }
 
     TestCase {
         name: "Bars3D Empty"
+        when: windowShown
 
         function test_empty() {
+            constructEmpty()
             compare(empty.width, 0, "width")
             compare(empty.height, 0, "height")
             compare(empty.multiSeriesUniform, false, "multiSeriesUniform")
@@ -89,6 +115,9 @@ Item {
             compare(empty.columnAxis.type, AbstractAxis3D.AxisTypeCategory)
             compare(empty.rowAxis.type, AbstractAxis3D.AxisTypeCategory)
             compare(empty.valueAxis.type, AbstractAxis3D.AxisTypeValue)
+            waitForRendering(top)
+            empty.destroy()
+            waitForRendering(top)
         }
     }
 
@@ -96,7 +125,8 @@ Item {
         name: "Bars3D Basic"
         when: windowShown
 
-        function test_basic() {
+        function test_1_basic() {
+            constructBasic()
             compare(basic.width, 150, "width")
             compare(basic.height, 150, "height")
             compare(basic.multiSeriesUniform, true, "multiSeriesUniform")
@@ -104,9 +134,10 @@ Item {
             compare(basic.barSpacing, Qt.size(0.1, 0.1), "barSpacing")
             compare(basic.barSpacingRelative, false, "barSpacingRelative")
             compare(basic.floorLevel, 1.0, "floorLevel")
+            waitForRendering(top)
         }
 
-        function test_change_basic() {
+        function test_2_basic_change() {
             basic.multiSeriesUniform = false
             basic.barThickness = 0.5
             basic.barSpacing = Qt.size(1.0, 0.0)
@@ -117,13 +148,17 @@ Item {
             compare(basic.barSpacing, Qt.size(1.0, 0.0), "barSpacing")
             compare(basic.barSpacingRelative, true, "barSpacingRelative")
             compare(basic.floorLevel, 0.2, "floorLevel")
+            waitForRendering(top)
         }
 
-        function test_change_invalid_basic() {
+        function test_3_basic_change_invalid() {
             basic.barThickness = -1
             basic.barSpacing = Qt.size(-1.0, -1.0)
             compare(basic.barThickness, -1/*0.5*/, "barThickness") // TODO: Fix once QTRD-3367 is done
             compare(basic.barSpacing, Qt.size(1.0, 0.0), "barSpacing")
+            waitForRendering(top)
+            basic.destroy()
+            waitForRendering(top)
         }
     }
 
@@ -132,6 +167,7 @@ Item {
         when: windowShown
 
         function test_1_common() {
+            constructCommon()
             compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode")
             compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality")
             if (common.shadowsSupported === true)
@@ -154,6 +190,7 @@ Item {
             compare(common.locale, Qt.locale("C"), "locale")
             compare(common.queriedGraphPosition, Qt.vector3d(0, 0, 0), "queriedGraphPosition")
             compare(common.margin, -1, "margin")
+            waitForRendering(top)
         }
 
         function test_2_change_common() {
@@ -194,6 +231,7 @@ Item {
             compare(common.reflectivity, 1.0, "reflectivity")
             compare(common.locale, Qt.locale("FI"), "locale")
             compare(common.margin, 1.0, "margin")
+            waitForRendering(top)
         }
 
         function test_3_change_invalid_common() {
@@ -213,15 +251,21 @@ Item {
             compare(common.aspectRatio, -1.0/*1.0*/, "aspectRatio") // TODO: Fix once QTRD-3367 is done
             compare(common.horizontalAspectRatio, -2/*1*/, "horizontalAspectRatio") // TODO: Fix once QTRD-3367 is done
             compare(common.reflectivity, -1.0/*1.0*/, "reflectivity") // TODO: Fix once QTRD-3367 is done
+
+            waitForRendering(top)
+            common.destroy()
+            waitForRendering(top)
         }
 
         function test_4_common_initialized() {
+            constructCommonInit()
+
             compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode")
             if (common_init.shadowsSupported === true) {
-                compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality")
+                tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityLow)
                 compare(common_init.msaaSamples, 2, "msaaSamples")
             } else {
-                compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality")
+                tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityNone)
                 compare(common_init.msaaSamples, 0, "msaaSamples")
             }
             compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme")
@@ -238,6 +282,10 @@ Item {
             compare(common_init.reflectivity, 0.1, "reflectivity")
             compare(common_init.locale, Qt.locale("UK"), "locale")
             compare(common_init.margin, 0.2, "margin")
+
+            waitForRendering(top)
+            common_init.destroy();
+            waitForRendering(top)
         }
     }
 }
diff --git a/tests/auto/qmltest/scatter3d/tst_basic.qml b/tests/auto/qmltest/scatter3d/tst_basic.qml
index 2e389b69..5cbcfe0d 100644
--- a/tests/auto/qmltest/scatter3d/tst_basic.qml
+++ b/tests/auto/qmltest/scatter3d/tst_basic.qml
@@ -28,45 +28,71 @@ Item {
     height: 150
     width: 150
 
-    Scatter3D {
-        id: empty
+    property var empty: null
+    property var basic: null
+    property var common: null
+    property var common_init: null
+
+    function constructEmpty() {
+        empty = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Scatter3D {
+        }", top)
     }
 
-    Scatter3D {
-        id: basic
-        anchors.fill: parent
+    function constructBasic() {
+        basic = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Scatter3D {
+            anchors.fill: parent
+        }", top)
+        basic.anchors.fill = top
     }
 
-    Scatter3D {
-        id: common
-        anchors.fill: parent
+    function constructCommon() {
+        common = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Scatter3D {
+            anchors.fill: parent
+        }", top)
+        common.anchors.fill = top
     }
 
-    Scatter3D {
-        id: common_init
-        anchors.fill: parent
-        selectionMode: AbstractGraph3D.SelectionNone
-        shadowQuality: AbstractGraph3D.ShadowQualityLow
-        msaaSamples: 2
-        theme: Theme3D { }
-        renderingMode: AbstractGraph3D.RenderIndirect
-        measureFps: true
-        orthoProjection: false
-        aspectRatio: 3.0
-        optimizationHints: AbstractGraph3D.OptimizationStatic
-        polar: false
-        radialLabelOffset: 2
-        horizontalAspectRatio: 0.2
-        reflection: true
-        reflectivity: 0.1
-        locale: Qt.locale("UK")
-        margin: 0.2
+    function constructCommonInit() {
+        common_init = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Scatter3D {
+            anchors.fill: parent
+            selectionMode: AbstractGraph3D.SelectionNone
+            shadowQuality: AbstractGraph3D.ShadowQualityLow
+            msaaSamples: 2
+            theme: Theme3D { }
+            renderingMode: AbstractGraph3D.RenderIndirect
+            measureFps: true
+            orthoProjection: false
+            aspectRatio: 3.0
+            optimizationHints: AbstractGraph3D.OptimizationStatic
+            polar: false
+            radialLabelOffset: 2
+            horizontalAspectRatio: 0.2
+            reflection: true
+            reflectivity: 0.1
+            locale: Qt.locale(\"UK\")
+            margin: 0.2
+        }", top)
+        common_init.anchors.fill = top
     }
 
     TestCase {
         name: "Scatter3D Empty"
+        when: windowShown
 
         function test_empty() {
+            constructEmpty()
             compare(empty.width, 0, "width")
             compare(empty.height, 0, "height")
             compare(empty.seriesList.length, 0, "seriesList")
@@ -77,6 +103,9 @@ Item {
             compare(empty.axisX.type, AbstractAxis3D.AxisTypeValue)
             compare(empty.axisZ.type, AbstractAxis3D.AxisTypeValue)
             compare(empty.axisY.type, AbstractAxis3D.AxisTypeValue)
+            waitForRendering(top)
+            empty.destroy()
+            waitForRendering(top)
         }
     }
 
@@ -85,8 +114,12 @@ Item {
         when: windowShown
 
         function test_basic() {
+            constructBasic()
             compare(basic.width, 150, "width")
             compare(basic.height, 150, "height")
+            waitForRendering(top)
+            basic.destroy()
+            waitForRendering(top)
         }
     }
 
@@ -95,6 +128,7 @@ Item {
         when: windowShown
 
         function test_1_common() {
+            constructCommon()
             compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode")
             compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality")
             if (common.shadowsSupported === true)
@@ -117,6 +151,7 @@ Item {
             compare(common.locale, Qt.locale("C"), "locale")
             compare(common.queriedGraphPosition, Qt.vector3d(0, 0, 0), "queriedGraphPosition")
             compare(common.margin, -1, "margin")
+            waitForRendering(top)
         }
 
         function test_2_change_common() {
@@ -157,6 +192,7 @@ Item {
             compare(common.reflectivity, 1.0, "reflectivity")
             compare(common.locale, Qt.locale("FI"), "locale")
             compare(common.margin, 1.0, "margin")
+            waitForRendering(top)
         }
 
         function test_3_change_invalid_common() {
@@ -176,15 +212,21 @@ Item {
             compare(common.aspectRatio, -1.0/*1.0*/, "aspectRatio") // TODO: Fix once QTRD-3367 is done
             compare(common.horizontalAspectRatio, -2/*1*/, "horizontalAspectRatio") // TODO: Fix once QTRD-3367 is done
             compare(common.reflectivity, -1.0/*1.0*/, "reflectivity") // TODO: Fix once QTRD-3367 is done
+
+            waitForRendering(top)
+            common.destroy()
+            waitForRendering(top)
         }
 
         function test_4_common_initialized() {
+            constructCommonInit()
+
             compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode")
             if (common_init.shadowsSupported === true) {
-                compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality")
+                tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityLow)
                 compare(common_init.msaaSamples, 2, "msaaSamples")
             } else {
-                compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality")
+                tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityNone)
                 compare(common_init.msaaSamples, 0, "msaaSamples")
             }
             compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme")
@@ -201,6 +243,10 @@ Item {
             compare(common_init.reflectivity, 0.1, "reflectivity")
             compare(common_init.locale, Qt.locale("UK"), "locale")
             compare(common_init.margin, 0.2, "margin")
+
+            waitForRendering(top)
+            common_init.destroy();
+            waitForRendering(top)
         }
     }
 }
diff --git a/tests/auto/qmltest/surface3d/tst_basic.qml b/tests/auto/qmltest/surface3d/tst_basic.qml
index afe44235..76b88b8f 100644
--- a/tests/auto/qmltest/surface3d/tst_basic.qml
+++ b/tests/auto/qmltest/surface3d/tst_basic.qml
@@ -28,46 +28,72 @@ Item {
     height: 150
     width: 150
 
-    Surface3D {
-        id: empty
+    property var empty: null
+    property var basic: null
+    property var common: null
+    property var common_init: null
+
+    function constructEmpty() {
+        empty = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Surface3D {
+        }", top)
     }
 
-    Surface3D {
-        id: basic
-        anchors.fill: parent
-        flipHorizontalGrid: true
+    function constructBasic() {
+        basic = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Surface3D {
+            anchors.fill: parent
+            flipHorizontalGrid: true
+        }", top)
+        basic.anchors.fill = top
     }
 
-    Surface3D {
-        id: common
-        anchors.fill: parent
+    function constructCommon() {
+        common = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Surface3D {
+            anchors.fill: parent
+        }", top)
+        common.anchors.fill = top
     }
 
-    Surface3D {
-        id: common_init
-        anchors.fill: parent
-        selectionMode: AbstractGraph3D.SelectionNone
-        shadowQuality: AbstractGraph3D.ShadowQualityLow
-        msaaSamples: 2
-        theme: Theme3D { }
-        renderingMode: AbstractGraph3D.RenderIndirect
-        measureFps: true
-        orthoProjection: false
-        aspectRatio: 3.0
-        optimizationHints: AbstractGraph3D.OptimizationStatic
-        polar: false
-        radialLabelOffset: 2
-        horizontalAspectRatio: 0.2
-        reflection: true
-        reflectivity: 0.1
-        locale: Qt.locale("UK")
-        margin: 0.2
+    function constructCommonInit() {
+        common_init = Qt.createQmlObject("
+        import QtQuick 2.2
+        import QtDataVisualization 1.2
+        Surface3D {
+            anchors.fill: parent
+            selectionMode: AbstractGraph3D.SelectionNone
+            shadowQuality: AbstractGraph3D.ShadowQualityLow
+            msaaSamples: 2
+            theme: Theme3D { }
+            renderingMode: AbstractGraph3D.RenderIndirect
+            measureFps: true
+            orthoProjection: false
+            aspectRatio: 3.0
+            optimizationHints: AbstractGraph3D.OptimizationStatic
+            polar: false
+            radialLabelOffset: 2
+            horizontalAspectRatio: 0.2
+            reflection: true
+            reflectivity: 0.1
+            locale: Qt.locale(\"UK\")
+            margin: 0.2
+        }", top)
+        common_init.anchors.fill = top
     }
 
     TestCase {
         name: "Surface3D Empty"
+        when: windowShown
 
         function test_empty() {
+            constructEmpty()
             compare(empty.width, 0, "width")
             compare(empty.height, 0, "height")
             compare(empty.seriesList.length, 0, "seriesList")
@@ -79,6 +105,9 @@ Item {
             compare(empty.axisX.type, AbstractAxis3D.AxisTypeValue)
             compare(empty.axisZ.type, AbstractAxis3D.AxisTypeValue)
             compare(empty.axisY.type, AbstractAxis3D.AxisTypeValue)
+            waitForRendering(top)
+            empty.destroy()
+            waitForRendering(top)
         }
     }
 
@@ -86,15 +115,19 @@ Item {
         name: "Surface3D Basic"
         when: windowShown
 
-        function test_basic() {
+        function test_1_basic() {
+            constructBasic()
             compare(basic.width, 150, "width")
             compare(basic.height, 150, "height")
             compare(basic.flipHorizontalGrid, true, "flipHorizontalGrid")
         }
 
-        function test_change_basic() {
+        function test_2_change_basic() {
             basic.flipHorizontalGrid = false
             compare(basic.flipHorizontalGrid, false, "flipHorizontalGrid")
+            waitForRendering(top)
+            basic.destroy()
+            waitForRendering(top)
         }
     }
 
@@ -103,6 +136,7 @@ Item {
         when: windowShown
 
         function test_1_common() {
+            constructCommon()
             compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode")
             compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality")
             if (common.shadowsSupported === true)
@@ -125,6 +159,7 @@ Item {
             compare(common.locale, Qt.locale("C"), "locale")
             compare(common.queriedGraphPosition, Qt.vector3d(0, 0, 0), "queriedGraphPosition")
             compare(common.margin, -1, "margin")
+            waitForRendering(top)
         }
 
         function test_2_change_common() {
@@ -165,6 +200,7 @@ Item {
             compare(common.reflectivity, 1.0, "reflectivity")
             compare(common.locale, Qt.locale("FI"), "locale")
             compare(common.margin, 1.0, "margin")
+            waitForRendering(top)
         }
 
         function test_3_change_invalid_common() {
@@ -184,15 +220,21 @@ Item {
             compare(common.aspectRatio, -1.0/*1.0*/, "aspectRatio") // TODO: Fix once QTRD-3367 is done
             compare(common.horizontalAspectRatio, -2/*1*/, "horizontalAspectRatio") // TODO: Fix once QTRD-3367 is done
             compare(common.reflectivity, -1.0/*1.0*/, "reflectivity") // TODO: Fix once QTRD-3367 is done
+
+            waitForRendering(top)
+            common.destroy()
+            waitForRendering(top)
         }
 
         function test_4_common_initialized() {
+            constructCommonInit()
+
             compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode")
             if (common_init.shadowsSupported === true) {
-                compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality")
+                tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityLow)
                 compare(common_init.msaaSamples, 2, "msaaSamples")
             } else {
-                compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality")
+                tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityNone)
                 compare(common_init.msaaSamples, 0, "msaaSamples")
             }
             compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme")
@@ -209,6 +251,10 @@ Item {
             compare(common_init.reflectivity, 0.1, "reflectivity")
             compare(common_init.locale, Qt.locale("UK"), "locale")
             compare(common_init.margin, 0.2, "margin")
+
+            waitForRendering(top)
+            common_init.destroy();
+            waitForRendering(top)
         }
     }
 }
diff --git a/tests/barstest/barstest.pro b/tests/manual/barstest/barstest.pro
similarity index 100%
rename from tests/barstest/barstest.pro
rename to tests/manual/barstest/barstest.pro
diff --git a/tests/barstest/barstest.qrc b/tests/manual/barstest/barstest.qrc
similarity index 100%
rename from tests/barstest/barstest.qrc
rename to tests/manual/barstest/barstest.qrc
diff --git a/tests/barstest/chart.cpp b/tests/manual/barstest/chart.cpp
similarity index 100%
rename from tests/barstest/chart.cpp
rename to tests/manual/barstest/chart.cpp
diff --git a/tests/barstest/chart.h b/tests/manual/barstest/chart.h
similarity index 100%
rename from tests/barstest/chart.h
rename to tests/manual/barstest/chart.h
diff --git a/tests/barstest/custominputhandler.cpp b/tests/manual/barstest/custominputhandler.cpp
similarity index 100%
rename from tests/barstest/custominputhandler.cpp
rename to tests/manual/barstest/custominputhandler.cpp
diff --git a/tests/barstest/custominputhandler.h b/tests/manual/barstest/custominputhandler.h
similarity index 100%
rename from tests/barstest/custominputhandler.h
rename to tests/manual/barstest/custominputhandler.h
diff --git a/tests/barstest/main.cpp b/tests/manual/barstest/main.cpp
similarity index 100%
rename from tests/barstest/main.cpp
rename to tests/manual/barstest/main.cpp
diff --git a/tests/barstest/shuttle.obj b/tests/manual/barstest/shuttle.obj
similarity index 100%
rename from tests/barstest/shuttle.obj
rename to tests/manual/barstest/shuttle.obj
diff --git a/tests/barstest/shuttle.png b/tests/manual/barstest/shuttle.png
similarity index 100%
rename from tests/barstest/shuttle.png
rename to tests/manual/barstest/shuttle.png
diff --git a/tests/directional/directional.pro b/tests/manual/directional/directional.pro
similarity index 100%
rename from tests/directional/directional.pro
rename to tests/manual/directional/directional.pro
diff --git a/tests/directional/main.cpp b/tests/manual/directional/main.cpp
similarity index 100%
rename from tests/directional/main.cpp
rename to tests/manual/directional/main.cpp
diff --git a/tests/directional/scatterdatamodifier.cpp b/tests/manual/directional/scatterdatamodifier.cpp
similarity index 100%
rename from tests/directional/scatterdatamodifier.cpp
rename to tests/manual/directional/scatterdatamodifier.cpp
diff --git a/tests/directional/scatterdatamodifier.h b/tests/manual/directional/scatterdatamodifier.h
similarity index 100%
rename from tests/directional/scatterdatamodifier.h
rename to tests/manual/directional/scatterdatamodifier.h
diff --git a/tests/galaxy/cumulativedistributor.cpp b/tests/manual/galaxy/cumulativedistributor.cpp
similarity index 100%
rename from tests/galaxy/cumulativedistributor.cpp
rename to tests/manual/galaxy/cumulativedistributor.cpp
diff --git a/tests/galaxy/cumulativedistributor.h b/tests/manual/galaxy/cumulativedistributor.h
similarity index 100%
rename from tests/galaxy/cumulativedistributor.h
rename to tests/manual/galaxy/cumulativedistributor.h
diff --git a/tests/galaxy/galaxy.pro b/tests/manual/galaxy/galaxy.pro
similarity index 100%
rename from tests/galaxy/galaxy.pro
rename to tests/manual/galaxy/galaxy.pro
diff --git a/tests/galaxy/galaxydata.cpp b/tests/manual/galaxy/galaxydata.cpp
similarity index 100%
rename from tests/galaxy/galaxydata.cpp
rename to tests/manual/galaxy/galaxydata.cpp
diff --git a/tests/galaxy/galaxydata.h b/tests/manual/galaxy/galaxydata.h
similarity index 100%
rename from tests/galaxy/galaxydata.h
rename to tests/manual/galaxy/galaxydata.h
diff --git a/tests/galaxy/main.cpp b/tests/manual/galaxy/main.cpp
similarity index 100%
rename from tests/galaxy/main.cpp
rename to tests/manual/galaxy/main.cpp
diff --git a/tests/galaxy/star.cpp b/tests/manual/galaxy/star.cpp
similarity index 100%
rename from tests/galaxy/star.cpp
rename to tests/manual/galaxy/star.cpp
diff --git a/tests/galaxy/star.h b/tests/manual/galaxy/star.h
similarity index 100%
rename from tests/galaxy/star.h
rename to tests/manual/galaxy/star.h
diff --git a/tests/itemmodeltest/itemmodeltest.pro b/tests/manual/itemmodeltest/itemmodeltest.pro
similarity index 100%
rename from tests/itemmodeltest/itemmodeltest.pro
rename to tests/manual/itemmodeltest/itemmodeltest.pro
diff --git a/tests/itemmodeltest/main.cpp b/tests/manual/itemmodeltest/main.cpp
similarity index 100%
rename from tests/itemmodeltest/main.cpp
rename to tests/manual/itemmodeltest/main.cpp
diff --git a/tests/kinectsurface/QtKinectWrapper/00openni_notes.txt b/tests/manual/kinectsurface/QtKinectWrapper/00openni_notes.txt
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/00openni_notes.txt
rename to tests/manual/kinectsurface/QtKinectWrapper/00openni_notes.txt
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/ARC/XnOSARC.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/ARC/XnOSARC.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/ARC/XnOSARC.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/ARC/XnOSARC.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/ARC/XnPlatformARC.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/ARC/XnPlatformARC.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/ARC/XnPlatformARC.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/ARC/XnPlatformARC.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Android-Arm/XnPlatformAndroid-Arm.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Android-Arm/XnPlatformAndroid-Arm.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Android-Arm/XnPlatformAndroid-Arm.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Android-Arm/XnPlatformAndroid-Arm.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/IXnNodeAllocator.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/IXnNodeAllocator.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/IXnNodeAllocator.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/IXnNodeAllocator.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-Arm/XnPlatformLinux-Arm.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-Arm/XnPlatformLinux-Arm.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-Arm/XnPlatformLinux-Arm.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-Arm/XnPlatformLinux-Arm.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnOSLinux-x86.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnOSLinux-x86.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnOSLinux-x86.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnOSLinux-x86.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnPlatformLinux-x86.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnPlatformLinux-x86.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnPlatformLinux-x86.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnPlatformLinux-x86.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/MacOSX/XnPlatformMacOSX.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/MacOSX/XnPlatformMacOSX.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/MacOSX/XnPlatformMacOSX.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/MacOSX/XnPlatformMacOSX.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/XnOSWin32.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/XnOSWin32.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/XnOSWin32.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/XnOSWin32.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/XnPlatformWin32.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/XnPlatformWin32.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/XnPlatformWin32.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/XnPlatformWin32.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/usb100.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/usb100.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/usb100.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Win32/usb100.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnAlgorithms.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnAlgorithms.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnAlgorithms.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnAlgorithms.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnArray.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnArray.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnArray.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnArray.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnBaseNode.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnBaseNode.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnBaseNode.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnBaseNode.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnBitSet.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnBitSet.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnBitSet.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnBitSet.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCallback.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCallback.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCallback.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCallback.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCodecIDs.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCodecIDs.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCodecIDs.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCodecIDs.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnContext.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnContext.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnContext.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnContext.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCppWrapper.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCppWrapper.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCppWrapper.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCppWrapper.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCyclicQueueT.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCyclicQueueT.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCyclicQueueT.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCyclicQueueT.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCyclicStackT.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCyclicStackT.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCyclicStackT.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnCyclicStackT.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDataTypes.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDataTypes.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDataTypes.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDataTypes.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDerivedCast.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDerivedCast.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDerivedCast.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDerivedCast.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDump.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDump.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDump.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDump.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDumpWriters.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDumpWriters.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDumpWriters.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnDumpWriters.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEnumerationErrors.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEnumerationErrors.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEnumerationErrors.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEnumerationErrors.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEvent.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEvent.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEvent.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEvent.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEventT.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEventT.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEventT.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnEventT.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnFPSCalculator.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnFPSCalculator.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnFPSCalculator.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnFPSCalculator.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnGeneralBuffer.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnGeneralBuffer.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnGeneralBuffer.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnGeneralBuffer.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnHash.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnHash.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnHash.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnHash.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnHashT.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnHashT.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnHashT.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnHashT.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnInternalDefs.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnInternalDefs.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnInternalDefs.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnInternalDefs.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLicensing.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLicensing.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLicensing.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLicensing.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnList.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnList.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnList.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnList.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnListT.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnListT.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnListT.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnListT.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLog.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLog.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLog.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLog.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLogTypes.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLogTypes.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLogTypes.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLogTypes.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLogWriterBase.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLogWriterBase.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLogWriterBase.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnLogWriterBase.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnMacros.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnMacros.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnMacros.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnMacros.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCFunctions.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCFunctions.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCFunctions.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCFunctions.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCppInterface.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCppInterface.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCppInterface.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCppInterface.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCppRegistratration.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCppRegistratration.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCppRegistratration.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleCppRegistratration.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleInterface.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleInterface.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleInterface.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnModuleInterface.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnNode.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnNode.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnNode.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnNode.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnNodeAllocator.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnNodeAllocator.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnNodeAllocator.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnNodeAllocator.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOS.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOS.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOS.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOS.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSCpp.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSCpp.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSCpp.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSCpp.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSMemory.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSMemory.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSMemory.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSMemory.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSStrings.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSStrings.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSStrings.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOSStrings.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOpenNI.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOpenNI.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOpenNI.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnOpenNI.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPlatform.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPlatform.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPlatform.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPlatform.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNode.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNode.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNode.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNode.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNodeInfo.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNodeInfo.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNodeInfo.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNodeInfo.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNodeInfoList.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNodeInfoList.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNodeInfoList.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPrdNodeInfoList.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnProfiling.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnProfiling.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnProfiling.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnProfiling.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPropNames.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPropNames.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPropNames.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnPropNames.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueries.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueries.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueries.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueries.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueue.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueue.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueue.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueue.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueueT.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueueT.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueueT.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnQueueT.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnScheduler.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnScheduler.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnScheduler.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnScheduler.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStack.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStack.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStack.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStack.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStackT.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStackT.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStackT.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStackT.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatus.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatus.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatus.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatus.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatusCodes.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatusCodes.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatusCodes.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatusCodes.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatusRegister.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatusRegister.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatusRegister.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStatusRegister.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStringsHash.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStringsHash.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStringsHash.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStringsHash.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStringsHashT.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStringsHashT.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStringsHashT.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnStringsHashT.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnThreadSafeQueue.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnThreadSafeQueue.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnThreadSafeQueue.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnThreadSafeQueue.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnTypes.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnTypes.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnTypes.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnTypes.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUSB.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUSB.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUSB.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUSB.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUSBDevice.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUSBDevice.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUSBDevice.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUSBDevice.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUtils.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUtils.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUtils.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnUtils.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnVersion.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnVersion.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnVersion.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/XnVersion.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/mingw-win32/XnOSLinux-x86.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/mingw-win32/XnOSLinux-x86.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/mingw-win32/XnOSLinux-x86.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/mingw-win32/XnOSLinux-x86.h
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/mingw-win32/XnPlatformLinux-x86.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/mingw-win32/XnPlatformLinux-x86.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/OpenNI/Include/mingw-win32/XnPlatformLinux-x86.h
rename to tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/mingw-win32/XnPlatformLinux-x86.h
diff --git a/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.cpp b/tests/manual/kinectsurface/QtKinectWrapper/QKinectWrapper.cpp
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/QKinectWrapper.cpp
rename to tests/manual/kinectsurface/QtKinectWrapper/QKinectWrapper.cpp
diff --git a/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h b/tests/manual/kinectsurface/QtKinectWrapper/QKinectWrapper.h
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h
rename to tests/manual/kinectsurface/QtKinectWrapper/QKinectWrapper.h
diff --git a/tests/kinectsurface/QtKinectWrapper/config.pro b/tests/manual/kinectsurface/QtKinectWrapper/config.pro
similarity index 100%
rename from tests/kinectsurface/QtKinectWrapper/config.pro
rename to tests/manual/kinectsurface/QtKinectWrapper/config.pro
diff --git a/tests/kinectsurface/kinectsurface.pro b/tests/manual/kinectsurface/kinectsurface.pro
similarity index 100%
rename from tests/kinectsurface/kinectsurface.pro
rename to tests/manual/kinectsurface/kinectsurface.pro
diff --git a/tests/kinectsurface/main.cpp b/tests/manual/kinectsurface/main.cpp
similarity index 100%
rename from tests/kinectsurface/main.cpp
rename to tests/manual/kinectsurface/main.cpp
diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/manual/kinectsurface/surfacedata.cpp
similarity index 100%
rename from tests/kinectsurface/surfacedata.cpp
rename to tests/manual/kinectsurface/surfacedata.cpp
diff --git a/tests/kinectsurface/surfacedata.h b/tests/manual/kinectsurface/surfacedata.h
similarity index 100%
rename from tests/kinectsurface/surfacedata.h
rename to tests/manual/kinectsurface/surfacedata.h
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
new file mode 100644
index 00000000..0a31e9e5
--- /dev/null
+++ b/tests/manual/manual.pro
@@ -0,0 +1,30 @@
+TEMPLATE = subdirs
+
+qtHaveModule(quick) {
+    SUBDIRS += qmlcamera \
+               qmldynamicdata \
+               qmlmultiwindow \
+               qmlmultitest \
+               qmlvolume \
+               qmlperf
+}
+
+!android:!ios:!winrt {
+    SUBDIRS += barstest \
+               scattertest \
+               surfacetest \
+               multigraphs \
+               directional \
+               itemmodeltest \
+               volumetrictest
+
+    # For testing code snippets of minimal applications
+    SUBDIRS += minimalbars \
+               minimalscatter \
+               minimalsurface
+
+    # Requires Kinect drivers
+    #SUBDIRS += kinectsurface
+}
+
+qtHaveModule(multimedia):!android:!static:!winrt: SUBDIRS += spectrum
diff --git a/tests/minimalbars/minimalbars.pro b/tests/manual/minimalbars/minimalbars.pro
similarity index 63%
rename from tests/minimalbars/minimalbars.pro
rename to tests/manual/minimalbars/minimalbars.pro
index bfb48f68..f4be07d1 100644
--- a/tests/minimalbars/minimalbars.pro
+++ b/tests/manual/minimalbars/minimalbars.pro
@@ -7,4 +7,4 @@ QT += core gui datavisualization
 TARGET = MinimalBars
 TEMPLATE = app
 
-SOURCES += ../../src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp
+SOURCES += ../../../src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp
diff --git a/tests/minimalscatter/minimalscatter.pro b/tests/manual/minimalscatter/minimalscatter.pro
similarity index 62%
rename from tests/minimalscatter/minimalscatter.pro
rename to tests/manual/minimalscatter/minimalscatter.pro
index 27147be6..0095c95e 100644
--- a/tests/minimalscatter/minimalscatter.pro
+++ b/tests/manual/minimalscatter/minimalscatter.pro
@@ -7,4 +7,4 @@ QT += core gui datavisualization
 TARGET = MinimalScatter
 TEMPLATE = app
 
-SOURCES += ../../src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp
+SOURCES += ../../../src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp
diff --git a/tests/minimalsurface/minimalsurface.pro b/tests/manual/minimalsurface/minimalsurface.pro
similarity index 62%
rename from tests/minimalsurface/minimalsurface.pro
rename to tests/manual/minimalsurface/minimalsurface.pro
index b70d4f76..0a6aaef6 100644
--- a/tests/minimalsurface/minimalsurface.pro
+++ b/tests/manual/minimalsurface/minimalsurface.pro
@@ -7,4 +7,4 @@ QT += core gui datavisualization
 TARGET = minimalSurface
 TEMPLATE = app
 
-SOURCES += ../../src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp
+SOURCES += ../../../src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp
diff --git a/tests/multigraphs/australia.png b/tests/manual/multigraphs/australia.png
similarity index 100%
rename from tests/multigraphs/australia.png
rename to tests/manual/multigraphs/australia.png
diff --git a/tests/multigraphs/data.cpp b/tests/manual/multigraphs/data.cpp
similarity index 100%
rename from tests/multigraphs/data.cpp
rename to tests/manual/multigraphs/data.cpp
diff --git a/tests/multigraphs/data.h b/tests/manual/multigraphs/data.h
similarity index 100%
rename from tests/multigraphs/data.h
rename to tests/manual/multigraphs/data.h
diff --git a/tests/multigraphs/main.cpp b/tests/manual/multigraphs/main.cpp
similarity index 100%
rename from tests/multigraphs/main.cpp
rename to tests/manual/multigraphs/main.cpp
diff --git a/tests/multigraphs/multigraphs.pro b/tests/manual/multigraphs/multigraphs.pro
similarity index 100%
rename from tests/multigraphs/multigraphs.pro
rename to tests/manual/multigraphs/multigraphs.pro
diff --git a/tests/multigraphs/multigraphs.qrc b/tests/manual/multigraphs/multigraphs.qrc
similarity index 100%
rename from tests/multigraphs/multigraphs.qrc
rename to tests/manual/multigraphs/multigraphs.qrc
diff --git a/tests/qmlcamera/main.cpp b/tests/manual/qmlcamera/main.cpp
similarity index 100%
rename from tests/qmlcamera/main.cpp
rename to tests/manual/qmlcamera/main.cpp
diff --git a/tests/qmlcamera/qml/qmlcamera/Axes.qml b/tests/manual/qmlcamera/qml/qmlcamera/Axes.qml
similarity index 100%
rename from tests/qmlcamera/qml/qmlcamera/Axes.qml
rename to tests/manual/qmlcamera/qml/qmlcamera/Axes.qml
diff --git a/tests/qmlcamera/qml/qmlcamera/ControlSurface.qml b/tests/manual/qmlcamera/qml/qmlcamera/ControlSurface.qml
similarity index 100%
rename from tests/qmlcamera/qml/qmlcamera/ControlSurface.qml
rename to tests/manual/qmlcamera/qml/qmlcamera/ControlSurface.qml
diff --git a/tests/qmlcamera/qml/qmlcamera/Data.qml b/tests/manual/qmlcamera/qml/qmlcamera/Data.qml
similarity index 100%
rename from tests/qmlcamera/qml/qmlcamera/Data.qml
rename to tests/manual/qmlcamera/qml/qmlcamera/Data.qml
diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/manual/qmlcamera/qml/qmlcamera/main.qml
similarity index 100%
rename from tests/qmlcamera/qml/qmlcamera/main.qml
rename to tests/manual/qmlcamera/qml/qmlcamera/main.qml
diff --git a/tests/qmlcamera/qmlcamera.pro b/tests/manual/qmlcamera/qmlcamera.pro
similarity index 100%
rename from tests/qmlcamera/qmlcamera.pro
rename to tests/manual/qmlcamera/qmlcamera.pro
diff --git a/tests/qmlcamera/qmlcamera.qrc b/tests/manual/qmlcamera/qmlcamera.qrc
similarity index 100%
rename from tests/qmlcamera/qmlcamera.qrc
rename to tests/manual/qmlcamera/qmlcamera.qrc
diff --git a/tests/qmlcamera/shuttle.obj b/tests/manual/qmlcamera/shuttle.obj
similarity index 100%
rename from tests/qmlcamera/shuttle.obj
rename to tests/manual/qmlcamera/shuttle.obj
diff --git a/tests/qmlcamera/shuttle.png b/tests/manual/qmlcamera/shuttle.png
similarity index 100%
rename from tests/qmlcamera/shuttle.png
rename to tests/manual/qmlcamera/shuttle.png
diff --git a/tests/qmldynamicdata/main.cpp b/tests/manual/qmldynamicdata/main.cpp
similarity index 100%
rename from tests/qmldynamicdata/main.cpp
rename to tests/manual/qmldynamicdata/main.cpp
diff --git a/tests/qmldynamicdata/qml/qmldynamicdata/NewButton.qml b/tests/manual/qmldynamicdata/qml/qmldynamicdata/NewButton.qml
similarity index 100%
rename from tests/qmldynamicdata/qml/qmldynamicdata/NewButton.qml
rename to tests/manual/qmldynamicdata/qml/qmldynamicdata/NewButton.qml
diff --git a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml b/tests/manual/qmldynamicdata/qml/qmldynamicdata/main.qml
similarity index 100%
rename from tests/qmldynamicdata/qml/qmldynamicdata/main.qml
rename to tests/manual/qmldynamicdata/qml/qmldynamicdata/main.qml
diff --git a/tests/qmldynamicdata/qmldynamicdata.pro b/tests/manual/qmldynamicdata/qmldynamicdata.pro
similarity index 100%
rename from tests/qmldynamicdata/qmldynamicdata.pro
rename to tests/manual/qmldynamicdata/qmldynamicdata.pro
diff --git a/tests/qmldynamicdata/qmldynamicdata.qrc b/tests/manual/qmldynamicdata/qmldynamicdata.qrc
similarity index 100%
rename from tests/qmldynamicdata/qmldynamicdata.qrc
rename to tests/manual/qmldynamicdata/qmldynamicdata.qrc
diff --git a/tests/qmlmultitest/main.cpp b/tests/manual/qmlmultitest/main.cpp
similarity index 100%
rename from tests/qmlmultitest/main.cpp
rename to tests/manual/qmlmultitest/main.cpp
diff --git a/tests/qmlmultitest/qml/qmlmultitest/Data.qml b/tests/manual/qmlmultitest/qml/qmlmultitest/Data.qml
similarity index 100%
rename from tests/qmlmultitest/qml/qmlmultitest/Data.qml
rename to tests/manual/qmlmultitest/qml/qmlmultitest/Data.qml
diff --git a/tests/qmlmultitest/qml/qmlmultitest/NewButton.qml b/tests/manual/qmlmultitest/qml/qmlmultitest/NewButton.qml
similarity index 100%
rename from tests/qmlmultitest/qml/qmlmultitest/NewButton.qml
rename to tests/manual/qmlmultitest/qml/qmlmultitest/NewButton.qml
diff --git a/tests/qmlmultitest/qml/qmlmultitest/main.qml b/tests/manual/qmlmultitest/qml/qmlmultitest/main.qml
similarity index 100%
rename from tests/qmlmultitest/qml/qmlmultitest/main.qml
rename to tests/manual/qmlmultitest/qml/qmlmultitest/main.qml
diff --git a/tests/qmlmultitest/qmlmultitest.pro b/tests/manual/qmlmultitest/qmlmultitest.pro
similarity index 100%
rename from tests/qmlmultitest/qmlmultitest.pro
rename to tests/manual/qmlmultitest/qmlmultitest.pro
diff --git a/tests/qmlmultitest/qmlmultitest.qrc b/tests/manual/qmlmultitest/qmlmultitest.qrc
similarity index 100%
rename from tests/qmlmultitest/qmlmultitest.qrc
rename to tests/manual/qmlmultitest/qmlmultitest.qrc
diff --git a/tests/qmlmultiwindow/main.cpp b/tests/manual/qmlmultiwindow/main.cpp
similarity index 100%
rename from tests/qmlmultiwindow/main.cpp
rename to tests/manual/qmlmultiwindow/main.cpp
diff --git a/tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml b/tests/manual/qmlmultiwindow/qml/qmlmultiwindow/Data.qml
similarity index 100%
rename from tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml
rename to tests/manual/qmlmultiwindow/qml/qmlmultiwindow/Data.qml
diff --git a/tests/qmlmultiwindow/qml/qmlmultiwindow/NewButton.qml b/tests/manual/qmlmultiwindow/qml/qmlmultiwindow/NewButton.qml
similarity index 100%
rename from tests/qmlmultiwindow/qml/qmlmultiwindow/NewButton.qml
rename to tests/manual/qmlmultiwindow/qml/qmlmultiwindow/NewButton.qml
diff --git a/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml b/tests/manual/qmlmultiwindow/qml/qmlmultiwindow/main.qml
similarity index 100%
rename from tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml
rename to tests/manual/qmlmultiwindow/qml/qmlmultiwindow/main.qml
diff --git a/tests/qmlmultiwindow/qmlmultiwindow.pro b/tests/manual/qmlmultiwindow/qmlmultiwindow.pro
similarity index 100%
rename from tests/qmlmultiwindow/qmlmultiwindow.pro
rename to tests/manual/qmlmultiwindow/qmlmultiwindow.pro
diff --git a/tests/qmlmultiwindow/qmlmultiwindow.qrc b/tests/manual/qmlmultiwindow/qmlmultiwindow.qrc
similarity index 100%
rename from tests/qmlmultiwindow/qmlmultiwindow.qrc
rename to tests/manual/qmlmultiwindow/qmlmultiwindow.qrc
diff --git a/tests/qmlperf/datagenerator.cpp b/tests/manual/qmlperf/datagenerator.cpp
similarity index 100%
rename from tests/qmlperf/datagenerator.cpp
rename to tests/manual/qmlperf/datagenerator.cpp
diff --git a/tests/qmlperf/datagenerator.h b/tests/manual/qmlperf/datagenerator.h
similarity index 100%
rename from tests/qmlperf/datagenerator.h
rename to tests/manual/qmlperf/datagenerator.h
diff --git a/tests/qmlperf/main.cpp b/tests/manual/qmlperf/main.cpp
similarity index 100%
rename from tests/qmlperf/main.cpp
rename to tests/manual/qmlperf/main.cpp
diff --git a/tests/qmlperf/qml/qmlperf/main.qml b/tests/manual/qmlperf/qml/qmlperf/main.qml
similarity index 100%
rename from tests/qmlperf/qml/qmlperf/main.qml
rename to tests/manual/qmlperf/qml/qmlperf/main.qml
diff --git a/tests/qmlperf/qmlperf.pro b/tests/manual/qmlperf/qmlperf.pro
similarity index 100%
rename from tests/qmlperf/qmlperf.pro
rename to tests/manual/qmlperf/qmlperf.pro
diff --git a/tests/qmlperf/qmlperf.qrc b/tests/manual/qmlperf/qmlperf.qrc
similarity index 100%
rename from tests/qmlperf/qmlperf.qrc
rename to tests/manual/qmlperf/qmlperf.qrc
diff --git a/tests/qmlvolume/datasource.cpp b/tests/manual/qmlvolume/datasource.cpp
similarity index 100%
rename from tests/qmlvolume/datasource.cpp
rename to tests/manual/qmlvolume/datasource.cpp
diff --git a/tests/qmlvolume/datasource.h b/tests/manual/qmlvolume/datasource.h
similarity index 100%
rename from tests/qmlvolume/datasource.h
rename to tests/manual/qmlvolume/datasource.h
diff --git a/tests/qmlvolume/main.cpp b/tests/manual/qmlvolume/main.cpp
similarity index 100%
rename from tests/qmlvolume/main.cpp
rename to tests/manual/qmlvolume/main.cpp
diff --git a/tests/qmlvolume/qml/qmlvolume/NewButton.qml b/tests/manual/qmlvolume/qml/qmlvolume/NewButton.qml
similarity index 100%
rename from tests/qmlvolume/qml/qmlvolume/NewButton.qml
rename to tests/manual/qmlvolume/qml/qmlvolume/NewButton.qml
diff --git a/tests/qmlvolume/qml/qmlvolume/main.qml b/tests/manual/qmlvolume/qml/qmlvolume/main.qml
similarity index 100%
rename from tests/qmlvolume/qml/qmlvolume/main.qml
rename to tests/manual/qmlvolume/qml/qmlvolume/main.qml
diff --git a/tests/qmlvolume/qmlvolume.pro b/tests/manual/qmlvolume/qmlvolume.pro
similarity index 100%
rename from tests/qmlvolume/qmlvolume.pro
rename to tests/manual/qmlvolume/qmlvolume.pro
diff --git a/tests/qmlvolume/qmlvolume.qrc b/tests/manual/qmlvolume/qmlvolume.qrc
similarity index 100%
rename from tests/qmlvolume/qmlvolume.qrc
rename to tests/manual/qmlvolume/qmlvolume.qrc
diff --git a/tests/scattertest/main.cpp b/tests/manual/scattertest/main.cpp
similarity index 100%
rename from tests/scattertest/main.cpp
rename to tests/manual/scattertest/main.cpp
diff --git a/tests/scattertest/scatterchart.cpp b/tests/manual/scattertest/scatterchart.cpp
similarity index 100%
rename from tests/scattertest/scatterchart.cpp
rename to tests/manual/scattertest/scatterchart.cpp
diff --git a/tests/scattertest/scatterchart.h b/tests/manual/scattertest/scatterchart.h
similarity index 100%
rename from tests/scattertest/scatterchart.h
rename to tests/manual/scattertest/scatterchart.h
diff --git a/tests/scattertest/scattertest.pro b/tests/manual/scattertest/scattertest.pro
similarity index 100%
rename from tests/scattertest/scattertest.pro
rename to tests/manual/scattertest/scattertest.pro
diff --git a/tests/spectrum/3rdparty/fftreal/Array.h b/tests/manual/spectrum/3rdparty/fftreal/Array.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/Array.h
rename to tests/manual/spectrum/3rdparty/fftreal/Array.h
diff --git a/tests/spectrum/3rdparty/fftreal/Array.hpp b/tests/manual/spectrum/3rdparty/fftreal/Array.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/Array.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/Array.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/DynArray.h b/tests/manual/spectrum/3rdparty/fftreal/DynArray.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/DynArray.h
rename to tests/manual/spectrum/3rdparty/fftreal/DynArray.h
diff --git a/tests/spectrum/3rdparty/fftreal/DynArray.hpp b/tests/manual/spectrum/3rdparty/fftreal/DynArray.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/DynArray.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/DynArray.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/FFTReal.dsp b/tests/manual/spectrum/3rdparty/fftreal/FFTReal.dsp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTReal.dsp
rename to tests/manual/spectrum/3rdparty/fftreal/FFTReal.dsp
diff --git a/tests/spectrum/3rdparty/fftreal/FFTReal.dsw b/tests/manual/spectrum/3rdparty/fftreal/FFTReal.dsw
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTReal.dsw
rename to tests/manual/spectrum/3rdparty/fftreal/FFTReal.dsw
diff --git a/tests/spectrum/3rdparty/fftreal/FFTReal.h b/tests/manual/spectrum/3rdparty/fftreal/FFTReal.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTReal.h
rename to tests/manual/spectrum/3rdparty/fftreal/FFTReal.h
diff --git a/tests/spectrum/3rdparty/fftreal/FFTReal.hpp b/tests/manual/spectrum/3rdparty/fftreal/FFTReal.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTReal.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/FFTReal.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealFixLen.h b/tests/manual/spectrum/3rdparty/fftreal/FFTRealFixLen.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealFixLen.h
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealFixLen.h
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp b/tests/manual/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h b/tests/manual/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.h b/tests/manual/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp b/tests/manual/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.h b/tests/manual/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp b/tests/manual/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealSelect.h b/tests/manual/spectrum/3rdparty/fftreal/FFTRealSelect.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealSelect.h
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealSelect.h
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealSelect.hpp b/tests/manual/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h b/tests/manual/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
diff --git a/tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp b/tests/manual/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/OscSinCos.h b/tests/manual/spectrum/3rdparty/fftreal/OscSinCos.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/OscSinCos.h
rename to tests/manual/spectrum/3rdparty/fftreal/OscSinCos.h
diff --git a/tests/spectrum/3rdparty/fftreal/OscSinCos.hpp b/tests/manual/spectrum/3rdparty/fftreal/OscSinCos.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/OscSinCos.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/OscSinCos.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/TestAccuracy.h b/tests/manual/spectrum/3rdparty/fftreal/TestAccuracy.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/TestAccuracy.h
rename to tests/manual/spectrum/3rdparty/fftreal/TestAccuracy.h
diff --git a/tests/spectrum/3rdparty/fftreal/TestAccuracy.hpp b/tests/manual/spectrum/3rdparty/fftreal/TestAccuracy.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/TestAccuracy.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/TestAccuracy.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/TestHelperFixLen.h b/tests/manual/spectrum/3rdparty/fftreal/TestHelperFixLen.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/TestHelperFixLen.h
rename to tests/manual/spectrum/3rdparty/fftreal/TestHelperFixLen.h
diff --git a/tests/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp b/tests/manual/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/TestHelperNormal.h b/tests/manual/spectrum/3rdparty/fftreal/TestHelperNormal.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/TestHelperNormal.h
rename to tests/manual/spectrum/3rdparty/fftreal/TestHelperNormal.h
diff --git a/tests/spectrum/3rdparty/fftreal/TestHelperNormal.hpp b/tests/manual/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/TestSpeed.h b/tests/manual/spectrum/3rdparty/fftreal/TestSpeed.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/TestSpeed.h
rename to tests/manual/spectrum/3rdparty/fftreal/TestSpeed.h
diff --git a/tests/spectrum/3rdparty/fftreal/TestSpeed.hpp b/tests/manual/spectrum/3rdparty/fftreal/TestSpeed.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/TestSpeed.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/TestSpeed.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h b/tests/manual/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
rename to tests/manual/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
diff --git a/tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp b/tests/manual/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/def.h b/tests/manual/spectrum/3rdparty/fftreal/def.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/def.h
rename to tests/manual/spectrum/3rdparty/fftreal/def.h
diff --git a/tests/spectrum/3rdparty/fftreal/fftreal.pas b/tests/manual/spectrum/3rdparty/fftreal/fftreal.pas
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/fftreal.pas
rename to tests/manual/spectrum/3rdparty/fftreal/fftreal.pas
diff --git a/tests/spectrum/3rdparty/fftreal/fftreal.pro b/tests/manual/spectrum/3rdparty/fftreal/fftreal.pro
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/fftreal.pro
rename to tests/manual/spectrum/3rdparty/fftreal/fftreal.pro
diff --git a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/tests/manual/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
rename to tests/manual/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
diff --git a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/tests/manual/spectrum/3rdparty/fftreal/fftreal_wrapper.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h
rename to tests/manual/spectrum/3rdparty/fftreal/fftreal_wrapper.h
diff --git a/tests/spectrum/3rdparty/fftreal/license.txt b/tests/manual/spectrum/3rdparty/fftreal/license.txt
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/license.txt
rename to tests/manual/spectrum/3rdparty/fftreal/license.txt
diff --git a/tests/spectrum/3rdparty/fftreal/readme.txt b/tests/manual/spectrum/3rdparty/fftreal/readme.txt
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/readme.txt
rename to tests/manual/spectrum/3rdparty/fftreal/readme.txt
diff --git a/tests/spectrum/3rdparty/fftreal/test.cpp b/tests/manual/spectrum/3rdparty/fftreal/test.cpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/test.cpp
rename to tests/manual/spectrum/3rdparty/fftreal/test.cpp
diff --git a/tests/spectrum/3rdparty/fftreal/test_fnc.h b/tests/manual/spectrum/3rdparty/fftreal/test_fnc.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/test_fnc.h
rename to tests/manual/spectrum/3rdparty/fftreal/test_fnc.h
diff --git a/tests/spectrum/3rdparty/fftreal/test_fnc.hpp b/tests/manual/spectrum/3rdparty/fftreal/test_fnc.hpp
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/test_fnc.hpp
rename to tests/manual/spectrum/3rdparty/fftreal/test_fnc.hpp
diff --git a/tests/spectrum/3rdparty/fftreal/test_settings.h b/tests/manual/spectrum/3rdparty/fftreal/test_settings.h
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/test_settings.h
rename to tests/manual/spectrum/3rdparty/fftreal/test_settings.h
diff --git a/tests/spectrum/3rdparty/fftreal/testapp.dpr b/tests/manual/spectrum/3rdparty/fftreal/testapp.dpr
similarity index 100%
rename from tests/spectrum/3rdparty/fftreal/testapp.dpr
rename to tests/manual/spectrum/3rdparty/fftreal/testapp.dpr
diff --git a/tests/spectrum/README.txt b/tests/manual/spectrum/README.txt
similarity index 100%
rename from tests/spectrum/README.txt
rename to tests/manual/spectrum/README.txt
diff --git a/tests/spectrum/spectrum.pri b/tests/manual/spectrum/spectrum.pri
similarity index 100%
rename from tests/spectrum/spectrum.pri
rename to tests/manual/spectrum/spectrum.pri
diff --git a/tests/spectrum/spectrum.pro b/tests/manual/spectrum/spectrum.pro
similarity index 100%
rename from tests/spectrum/spectrum.pro
rename to tests/manual/spectrum/spectrum.pro
diff --git a/tests/spectrum/spectrumapp/engine.cpp b/tests/manual/spectrum/spectrumapp/engine.cpp
similarity index 100%
rename from tests/spectrum/spectrumapp/engine.cpp
rename to tests/manual/spectrum/spectrumapp/engine.cpp
diff --git a/tests/spectrum/spectrumapp/engine.h b/tests/manual/spectrum/spectrumapp/engine.h
similarity index 100%
rename from tests/spectrum/spectrumapp/engine.h
rename to tests/manual/spectrum/spectrumapp/engine.h
diff --git a/tests/spectrum/spectrumapp/frequencyspectrum.cpp b/tests/manual/spectrum/spectrumapp/frequencyspectrum.cpp
similarity index 100%
rename from tests/spectrum/spectrumapp/frequencyspectrum.cpp
rename to tests/manual/spectrum/spectrumapp/frequencyspectrum.cpp
diff --git a/tests/spectrum/spectrumapp/frequencyspectrum.h b/tests/manual/spectrum/spectrumapp/frequencyspectrum.h
similarity index 100%
rename from tests/spectrum/spectrumapp/frequencyspectrum.h
rename to tests/manual/spectrum/spectrumapp/frequencyspectrum.h
diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/manual/spectrum/spectrumapp/main.cpp
similarity index 100%
rename from tests/spectrum/spectrumapp/main.cpp
rename to tests/manual/spectrum/spectrumapp/main.cpp
diff --git a/tests/spectrum/spectrumapp/soundFiles/Rockhop.wav b/tests/manual/spectrum/spectrumapp/soundFiles/Rockhop.wav
similarity index 100%
rename from tests/spectrum/spectrumapp/soundFiles/Rockhop.wav
rename to tests/manual/spectrum/spectrumapp/soundFiles/Rockhop.wav
diff --git a/tests/spectrum/spectrumapp/soundFiles/futurebells_beat.wav b/tests/manual/spectrum/spectrumapp/soundFiles/futurebells_beat.wav
similarity index 100%
rename from tests/spectrum/spectrumapp/soundFiles/futurebells_beat.wav
rename to tests/manual/spectrum/spectrumapp/soundFiles/futurebells_beat.wav
diff --git a/tests/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav b/tests/manual/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav
similarity index 100%
rename from tests/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav
rename to tests/manual/spectrum/spectrumapp/soundFiles/onclassical_demo_fiati-di-parma_thuille_terzo-tempo_sestetto_small-version.wav
diff --git a/tests/spectrum/spectrumapp/spectrum.h b/tests/manual/spectrum/spectrumapp/spectrum.h
similarity index 100%
rename from tests/spectrum/spectrumapp/spectrum.h
rename to tests/manual/spectrum/spectrumapp/spectrum.h
diff --git a/tests/spectrum/spectrumapp/spectrum.qrc b/tests/manual/spectrum/spectrumapp/spectrum.qrc
similarity index 100%
rename from tests/spectrum/spectrumapp/spectrum.qrc
rename to tests/manual/spectrum/spectrumapp/spectrum.qrc
diff --git a/tests/spectrum/spectrumapp/spectrumanalyser.cpp b/tests/manual/spectrum/spectrumapp/spectrumanalyser.cpp
similarity index 100%
rename from tests/spectrum/spectrumapp/spectrumanalyser.cpp
rename to tests/manual/spectrum/spectrumapp/spectrumanalyser.cpp
diff --git a/tests/spectrum/spectrumapp/spectrumanalyser.h b/tests/manual/spectrum/spectrumapp/spectrumanalyser.h
similarity index 100%
rename from tests/spectrum/spectrumapp/spectrumanalyser.h
rename to tests/manual/spectrum/spectrumapp/spectrumanalyser.h
diff --git a/tests/spectrum/spectrumapp/spectrumapp.pro b/tests/manual/spectrum/spectrumapp/spectrumapp.pro
similarity index 100%
rename from tests/spectrum/spectrumapp/spectrumapp.pro
rename to tests/manual/spectrum/spectrumapp/spectrumapp.pro
diff --git a/tests/spectrum/spectrumapp/utils.cpp b/tests/manual/spectrum/spectrumapp/utils.cpp
similarity index 100%
rename from tests/spectrum/spectrumapp/utils.cpp
rename to tests/manual/spectrum/spectrumapp/utils.cpp
diff --git a/tests/spectrum/spectrumapp/utils.h b/tests/manual/spectrum/spectrumapp/utils.h
similarity index 100%
rename from tests/spectrum/spectrumapp/utils.h
rename to tests/manual/spectrum/spectrumapp/utils.h
diff --git a/tests/spectrum/spectrumapp/wavfile.cpp b/tests/manual/spectrum/spectrumapp/wavfile.cpp
similarity index 100%
rename from tests/spectrum/spectrumapp/wavfile.cpp
rename to tests/manual/spectrum/spectrumapp/wavfile.cpp
diff --git a/tests/spectrum/spectrumapp/wavfile.h b/tests/manual/spectrum/spectrumapp/wavfile.h
similarity index 100%
rename from tests/spectrum/spectrumapp/wavfile.h
rename to tests/manual/spectrum/spectrumapp/wavfile.h
diff --git a/tests/surfacetest/Heightmap.png b/tests/manual/surfacetest/Heightmap.png
similarity index 100%
rename from tests/surfacetest/Heightmap.png
rename to tests/manual/surfacetest/Heightmap.png
diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/manual/surfacetest/graphmodifier.cpp
similarity index 100%
rename from tests/surfacetest/graphmodifier.cpp
rename to tests/manual/surfacetest/graphmodifier.cpp
diff --git a/tests/surfacetest/graphmodifier.h b/tests/manual/surfacetest/graphmodifier.h
similarity index 100%
rename from tests/surfacetest/graphmodifier.h
rename to tests/manual/surfacetest/graphmodifier.h
diff --git a/tests/surfacetest/main.cpp b/tests/manual/surfacetest/main.cpp
similarity index 100%
rename from tests/surfacetest/main.cpp
rename to tests/manual/surfacetest/main.cpp
diff --git a/tests/surfacetest/mapimage.png b/tests/manual/surfacetest/mapimage.png
similarity index 100%
rename from tests/surfacetest/mapimage.png
rename to tests/manual/surfacetest/mapimage.png
diff --git a/tests/surfacetest/surfacetest.pro b/tests/manual/surfacetest/surfacetest.pro
similarity index 100%
rename from tests/surfacetest/surfacetest.pro
rename to tests/manual/surfacetest/surfacetest.pro
diff --git a/tests/surfacetest/surfacetest.qrc b/tests/manual/surfacetest/surfacetest.qrc
similarity index 100%
rename from tests/surfacetest/surfacetest.qrc
rename to tests/manual/surfacetest/surfacetest.qrc
diff --git a/tests/tests.pri b/tests/manual/tests.pri
similarity index 86%
rename from tests/tests.pri
rename to tests/manual/tests.pri
index d6474f1b..b7a3fb92 100644
--- a/tests/tests.pri
+++ b/tests/manual/tests.pri
@@ -1,4 +1,4 @@
-INCLUDEPATH += ../../include
+INCLUDEPATH += ../../../include
 
 LIBS += -L$$OUT_PWD/../../lib
 
diff --git a/tests/volumetrictest/cubeFilledFlat.obj b/tests/manual/volumetrictest/cubeFilledFlat.obj
similarity index 100%
rename from tests/volumetrictest/cubeFilledFlat.obj
rename to tests/manual/volumetrictest/cubeFilledFlat.obj
diff --git a/tests/volumetrictest/logo.png b/tests/manual/volumetrictest/logo.png
similarity index 100%
rename from tests/volumetrictest/logo.png
rename to tests/manual/volumetrictest/logo.png
diff --git a/tests/volumetrictest/logo_no_padding.png b/tests/manual/volumetrictest/logo_no_padding.png
similarity index 100%
rename from tests/volumetrictest/logo_no_padding.png
rename to tests/manual/volumetrictest/logo_no_padding.png
diff --git a/tests/volumetrictest/main.cpp b/tests/manual/volumetrictest/main.cpp
similarity index 100%
rename from tests/volumetrictest/main.cpp
rename to tests/manual/volumetrictest/main.cpp
diff --git a/tests/volumetrictest/volumetrictest.cpp b/tests/manual/volumetrictest/volumetrictest.cpp
similarity index 100%
rename from tests/volumetrictest/volumetrictest.cpp
rename to tests/manual/volumetrictest/volumetrictest.cpp
diff --git a/tests/volumetrictest/volumetrictest.h b/tests/manual/volumetrictest/volumetrictest.h
similarity index 98%
rename from tests/volumetrictest/volumetrictest.h
rename to tests/manual/volumetrictest/volumetrictest.h
index 93d0ffae..69cf2010 100644
--- a/tests/volumetrictest/volumetrictest.h
+++ b/tests/manual/volumetrictest/volumetrictest.h
@@ -27,8 +27,7 @@
 #include <QtDataVisualization/q3dscatter.h>
 #include <QtDataVisualization/q3dsurface.h>
 #include <QtDataVisualization/q3dbars.h>
-
-class QLabel;
+#include <QtWidgets/QLabel>
 
 using namespace QtDataVisualization;
 
diff --git a/tests/volumetrictest/volumetrictest.pro b/tests/manual/volumetrictest/volumetrictest.pro
similarity index 100%
rename from tests/volumetrictest/volumetrictest.pro
rename to tests/manual/volumetrictest/volumetrictest.pro
diff --git a/tests/volumetrictest/volumetrictest.qrc b/tests/manual/volumetrictest/volumetrictest.qrc
similarity index 100%
rename from tests/volumetrictest/volumetrictest.qrc
rename to tests/manual/volumetrictest/volumetrictest.qrc
diff --git a/tests/tests.pro b/tests/tests.pro
index ef28a0da..caa90722 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -8,32 +8,4 @@ contains(QT_CONFIG, opengles1) {
 TEMPLATE = subdirs
 
 SUBDIRS += auto
-
-qtHaveModule(quick) {
-    SUBDIRS += qmlcamera \
-               qmldynamicdata \
-               qmlmultiwindow \
-               qmlmultitest \
-               qmlvolume \
-               qmlperf
-}
-
-!android:!ios:!winrt {
-    SUBDIRS += barstest \
-               scattertest \
-               surfacetest \
-               multigraphs \
-               directional \
-               itemmodeltest \
-               volumetrictest
-
-    # For testing code snippets of minimal applications
-    SUBDIRS += minimalbars \
-               minimalscatter \
-               minimalsurface
-
-    # Requires Kinect drivers
-    #SUBDIRS += kinectsurface
-}
-
-qtHaveModule(multimedia):!android:!static:!winrt: SUBDIRS += spectrum
+exists(manual): SUBDIRS += manual