Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-datavis3d for openSUSE:Factory checked in at 2023-10-13 23:14:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-datavis3d (Old) and /work/SRC/openSUSE:Factory/.qt6-datavis3d.new.20540 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-datavis3d" Fri Oct 13 23:14:12 2023 rev:22 rq:1116931 version:6.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-datavis3d/qt6-datavis3d.changes 2023-10-02 20:07:11.396365651 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-datavis3d.new.20540/qt6-datavis3d.changes 2023-10-13 23:14:36.886892790 +0200 @@ -1,0 +2,6 @@ +Tue Oct 10 09:39:50 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.6.0 + * https://www.qt.io/blog/qt-6.6-released + +------------------------------------------------------------------- Old: ---- qtdatavis3d-everywhere-src-6.5.3.tar.xz New: ---- qtdatavis3d-everywhere-src-6.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-datavis3d.spec ++++++ --- /var/tmp/diff_new_pack.72uQJW/_old 2023-10-13 23:14:38.250942265 +0200 +++ /var/tmp/diff_new_pack.72uQJW/_new 2023-10-13 23:14:38.250942265 +0200 @@ -16,8 +16,8 @@ # -%define real_version 6.5.3 -%define short_version 6.5 +%define real_version 6.6.0 +%define short_version 6.6 %define short_name qtdatavis3d %define tar_name qtdatavis3d-everywhere-src %define tar_suffix %{nil} @@ -28,7 +28,7 @@ %endif # Name: qt6-datavis3d%{?pkg_suffix} -Version: 6.5.3 +Version: 6.6.0 Release: 0 Summary: Qt 6 data visualization framework License: GPL-3.0-or-later ++++++ qtdatavis3d-everywhere-src-6.5.3.tar.xz -> qtdatavis3d-everywhere-src-6.6.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/.cmake.conf new/qtdatavis3d-everywhere-src-6.6.0/.cmake.conf --- old/qtdatavis3d-everywhere-src-6.5.3/.cmake.conf 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/.cmake.conf 2023-10-04 00:00:42.000000000 +0200 @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.5.3") +set(QT_REPO_MODULE_VERSION "6.6.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/.tag new/qtdatavis3d-everywhere-src-6.6.0/.tag --- old/qtdatavis3d-everywhere-src-6.5.3/.tag 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/.tag 2023-10-04 00:00:42.000000000 +0200 @@ -1 +1 @@ -13d26cf4d40daf3cc34cbac4be145d4f3e9aedb2 +c83ccedb91bc94d82da53c9f32fbd2c951ef6dbc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/coin/axivion/ci_config_linux.json new/qtdatavis3d-everywhere-src-6.6.0/coin/axivion/ci_config_linux.json --- old/qtdatavis3d-everywhere-src-6.5.3/coin/axivion/ci_config_linux.json 1970-01-01 01:00:00.000000000 +0100 +++ new/qtdatavis3d-everywhere-src-6.6.0/coin/axivion/ci_config_linux.json 2023-10-04 00:00:42.000000000 +0200 @@ -0,0 +1,60 @@ +{ + "Project": { + "Git": { + "_active": true, + "sourceserver_gitdir": "/data/axivion/databases/$(env:TESTED_MODULE_COIN).git" + }, + "BuildSystemIntegration": { + "child_order": [ + "GCCSetup", + "CMake", + "LinkLibraries" + ] + }, + "CMake": { + "_active": true, + "_copy_from": "CMakeIntegration", + "build_environment": {}, + "build_options": "-j4", + "generate_options": "--fresh", + "generator": "Ninja" + }, + "GCCSetup": { + "_active": true, + "_copy_from": "Command", + "build_command": "gccsetup --cc gcc --cxx g++ --config ../../../axivion/" + }, + "LinkLibraries": { + "_active": true, + "_copy_from": "AxivionLinker", + "input_files": [ + "build/lib/lib*.so*.ir", + "build/qml/*/lib*.so*.ir" + ], + "ir": "build/$(env:TESTED_MODULE_COIN).ir" + }, + "Project-GlobalOptions": { + "directory": "../work/qt/$(env:TESTED_MODULE_COIN)", + "ir": "build/$(env:TESTED_MODULE_COIN).ir", + "name": "qt_$(env:TESTED_MODULE_COIN)_dev_$(env:TARGET_OS_COIN)" + } + }, + "Results": { + "Dashboard": { + "dashboard_url": "https://axivion-srv.ci.qt.io/axivion/"; + }, + "Database": { + "ci_mode": { + "directory": "/data/axivion/databases" + } + } + }, + "_Format": "1.0", + "_Version": "trunk-9e0ef9c5818", + "_VersionNum": [ + 7, + 6, + 9999, + 11489 + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/dependencies.yaml new/qtdatavis3d-everywhere-src-6.6.0/dependencies.yaml --- old/qtdatavis3d-everywhere-src-6.5.3/dependencies.yaml 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/dependencies.yaml 2023-10-04 00:00:42.000000000 +0200 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: 372eaedc5b8c771c46acc4c96e91bbade4ca3624 + ref: 33f5e985e480283bb0ca9dea5f82643e825ba87c required: true ../qtdeclarative: - ref: e00c258fa5a4e122636d441967dea035865fac5d + ref: e559d5cf2b66c4a973f83f173d57676a21d287ef required: false ../qtmultimedia: - ref: 0762bb1e91495527f0978232212521c49291f7de + ref: fcb9950381ab8a5647d121fd9b305e4d9d734402 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/src/datavisualization/doc/qtdatavis3d.qdocconf new/qtdatavis3d-everywhere-src-6.6.0/src/datavisualization/doc/qtdatavis3d.qdocconf --- old/qtdatavis3d-everywhere-src-6.5.3/src/datavisualization/doc/qtdatavis3d.qdocconf 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/src/datavisualization/doc/qtdatavis3d.qdocconf 2023-10-04 00:00:42.000000000 +0200 @@ -47,5 +47,3 @@ navigation.landingpage = Qt Data Visualization navigation.cppclassespage = Qt Data Visualization C++ Classes navigation.qmltypespage = Qt Data Visualization QML Types - -manifestmeta.highlighted.names = "QtDataVis3D/Textured Surface Example" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc new/qtdatavis3d-everywhere-src-6.6.0/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc --- old/qtdatavis3d-everywhere-src-6.5.3/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/src/datavisualization/doc/src/qtdatavisualization-qml-abstractdeclarative.qdoc 2023-10-04 00:00:42.000000000 +0200 @@ -284,7 +284,7 @@ * \c selectedElementChanged signal is emitted. * * The signal can be used for example for implementing customized input - * handling, as demonstrated by the \l {Axis Dragging} example. + * handling, as demonstrated by the \l {Axis Handling} example. * * \sa selectedLabelIndex(), selectedAxis(), selectedCustomItemIndex(), selectedCustomItem(), * Bars3D::selectedSeries, Scatter3D::selectedSeries, Scene3D::selectionQueryPosition, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/src/datavisualization/input/q3dinputhandler.cpp new/qtdatavis3d-everywhere-src-6.6.0/src/datavisualization/input/q3dinputhandler.cpp --- old/qtdatavis3d-everywhere-src-6.5.3/src/datavisualization/input/q3dinputhandler.cpp 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/src/datavisualization/input/q3dinputhandler.cpp 2023-10-04 00:00:42.000000000 +0200 @@ -16,7 +16,7 @@ static const int midZoomRangeDivider = 60; static const int farZoomRangeDivider = 120; -static const float rotationSpeed = 100.0f; +[[maybe_unused]] static const float rotationSpeed = 100.0f; /*! * \class Q3DInputHandler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/src/datavisualizationqml/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/src/datavisualizationqml/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/src/datavisualizationqml/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/src/datavisualizationqml/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -49,7 +49,7 @@ RESOURCES ${resources} LIBRARIES - Qt::Core + Qt::CorePrivate Qt::Gui Qt::OpenGL Qt::Qml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/src/datavisualizationqml/abstractdeclarative.cpp new/qtdatavis3d-everywhere-src-6.6.0/src/datavisualizationqml/abstractdeclarative.cpp --- old/qtdatavis3d-everywhere-src-6.5.3/src/datavisualizationqml/abstractdeclarative.cpp 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/src/datavisualizationqml/abstractdeclarative.cpp 2023-10-04 00:00:42.000000000 +0200 @@ -565,7 +565,7 @@ QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions(); - if (isVisible()) { + if (funcs && isVisible()) { funcs->glDepthMask(GL_TRUE); funcs->glEnable(GL_DEPTH_TEST); funcs->glDepthFunc(GL_LESS); @@ -647,8 +647,8 @@ } QList<QQuickWindow *> windowList; - - foreach (AbstractDeclarative *graph, graphWindowList.keys()) { + const auto graphs = graphWindowList.keys(); + for (AbstractDeclarative *graph : graphs) { if (graph->m_renderMode == RenderDirectToBackground || graph->m_renderMode == RenderDirectToBackground_NoClear) { windowList.append(graphWindowList.value(graph)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3daxis-category/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3daxis-category/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3daxis-category/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3daxis-category/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3daxis-category +qt_internal_add_test(q3daxis-category_datavis SOURCES tst_axis.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3daxis-logvalue/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3daxis-logvalue +qt_internal_add_test(q3daxis-logvalue_datavis SOURCES tst_axis.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3daxis-value/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3daxis-value/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3daxis-value/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3daxis-value/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3daxis-value +qt_internal_add_test(q3daxis-value_datavis SOURCES tst_axis.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dbars/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dbars/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dbars/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dbars/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dbars +qt_internal_add_test(q3dbars_datavis SOURCES tst_bars.cpp INCLUDE_DIRECTORIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dbars-modelproxy/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dbars-modelproxy +qt_internal_add_test(q3dbars-modelproxy_datavis SOURCES tst_proxy.cpp INCLUDE_DIRECTORIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dbars-proxy/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dbars-proxy +qt_internal_add_test(q3dbars-proxy_datavis SOURCES tst_proxy.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dbars-series/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dbars-series/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dbars-series/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dbars-series/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dbars-series +qt_internal_add_test(q3dbars-series_datavis SOURCES tst_series.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dcustom/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dcustom/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dcustom/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dcustom/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dcustom +qt_internal_add_test(q3dcustom_datavis SOURCES tst_custom.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dcustom-label/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dcustom-label +qt_internal_add_test(q3dcustom-label_datavis SOURCES tst_custom.cpp INCLUDE_DIRECTORIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dcustom-volume/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dcustom-volume +qt_internal_add_test(q3dcustom-volume_datavis SOURCES tst_custom.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dinput/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dinput/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dinput/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dinput/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dinput +qt_internal_add_test(q3dinput_datavis SOURCES tst_input.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dinput-touch/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dinput-touch +qt_internal_add_test(q3dinput-touch_datavis SOURCES tst_input.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscatter/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscatter/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscatter/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscatter/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dscatter +qt_internal_add_test(q3dscatter_datavis SOURCES tst_scatter.cpp INCLUDE_DIRECTORIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscatter-modelproxy/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dscatter-modelproxy +qt_internal_add_test(q3dscatter-modelproxy_datavis SOURCES tst_proxy.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscatter-proxy/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dscatter-proxy +qt_internal_add_test(q3dscatter-proxy_datavis SOURCES tst_proxy.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscatter-series/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dscatter-series +qt_internal_add_test(q3dscatter-series_datavis SOURCES tst_series.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscene/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscene/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscene/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscene/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dscene +qt_internal_add_test(q3dscene_datavis SOURCES tst_scene.cpp INCLUDE_DIRECTORIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscene-camera/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dscene-camera +qt_internal_add_test(q3dscene-camera_datavis SOURCES tst_camera.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscene-light/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscene-light/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dscene-light/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dscene-light/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dscene-light +qt_internal_add_test(q3dscene-light_datavis SOURCES tst_light.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dsurface +qt_internal_add_test(q3dsurface_datavis SOURCES tst_surface.cpp INCLUDE_DIRECTORIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface-heightproxy/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dsurface-heightproxy +qt_internal_add_test(q3dsurface-heightproxy_datavis SOURCES tst_proxy.cpp LIBRARIES @@ -13,7 +13,7 @@ "customtexture.jpg" ) -qt_internal_add_resource(q3dsurface-heightproxy "q3dsurface-heightproxy" +qt_internal_add_resource(q3dsurface-heightproxy_datavis "q3dsurface-heightproxy" PREFIX "/" FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface-modelproxy/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dsurface-modelproxy +qt_internal_add_test(q3dsurface-modelproxy_datavis SOURCES tst_proxy.cpp INCLUDE_DIRECTORIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface-modelproxy-nan/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface-modelproxy-nan/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface-modelproxy-nan/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface-modelproxy-nan/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dsurface-modelproxy-nan +qt_internal_add_test(q3dsurface-modelproxy-nan_datavis SOURCES tst_proxy.cpp INCLUDE_DIRECTORIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface-proxy/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dsurface-proxy +qt_internal_add_test(q3dsurface-proxy_datavis SOURCES tst_proxy.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dsurface-series/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dsurface-series +qt_internal_add_test(q3dsurface-series_datavis SOURCES tst_series.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dtheme/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dtheme/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/cpptest/q3dtheme/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/cpptest/q3dtheme/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_test(q3dtheme +qt_internal_add_test(q3dtheme_datavis SOURCES tst_theme.cpp LIBRARIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/qmltest/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/qmltest/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/qmltest/CMakeLists.txt 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/qmltest/CMakeLists.txt 2023-10-04 00:00:42.000000000 +0200 @@ -6,7 +6,7 @@ *) list(APPEND test_data ${test_data_glob}) -qt_internal_add_test(tst_qmltest +qt_internal_add_test(tst_qmltest_datavis QMLTEST SOURCES tst_qmltest.cpp @@ -20,7 +20,7 @@ "customtexture.jpg" ) -qt_internal_add_resource(tst_qmltest "qmltest" +qt_internal_add_resource(tst_qmltest_datavis "qmltest" PREFIX "/" FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/qmltest/bars3d/tst_basic.qml new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/qmltest/bars3d/tst_basic.qml --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/qmltest/bars3d/tst_basic.qml 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/qmltest/bars3d/tst_basic.qml 2023-10-04 00:00:42.000000000 +0200 @@ -101,8 +101,6 @@ compare(empty.rowAxis.type, AbstractAxis3D.AxisTypeCategory) compare(empty.valueAxis.type, AbstractAxis3D.AxisTypeValue) waitForRendering(top) - empty.destroy() - waitForRendering(top) } } @@ -147,8 +145,6 @@ compare(basic.barSpacing, Qt.size(-1.0, -1.0), "barSpacing") compare(basic.barSeriesMargin, Qt.size(-1.0, -1.0), "barSeriesMargin") waitForRendering(top) - basic.destroy() - waitForRendering(top) } } @@ -161,12 +157,12 @@ return; constructCommon() + if (common.shadowsSupported === false) + return; + compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode") compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality") - if (common.shadowsSupported === true) - compare(common.msaaSamples, 4, "msaaSamples") - else - compare(common.msaaSamples, 0, "msaaSamples") + compare(common.msaaSamples, 4, "msaaSamples") compare(common.theme.type, Theme3D.ThemeQt, "theme") compare(common.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common.measureFps, false, "measureFps") @@ -187,17 +183,14 @@ } function test_2_change_common() { - if (Qt.platform.os === "android") + if (Qt.platform.os === "android" || common.shadowsSupported === false) return; common.selectionMode = AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh - compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") common.msaaSamples = 8 - if (common.shadowsSupported === true) - compare(common.msaaSamples, 8, "msaaSamples") - else - compare(common.msaaSamples, 0, "msaaSamples") + compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") + compare(common.msaaSamples, 8, "msaaSamples") common.theme.type = Theme3D.ThemeRetro common.renderingMode = AbstractGraph3D.RenderDirectToBackground_NoClear common.measureFps = true @@ -230,20 +223,45 @@ waitForRendering(top) } - function test_3_common_initialized() { + function test_3_change_invalid_common() { + if (Qt.platform.os === "android" || common.shadowsSupported === false) + return; + + common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice + common.theme.type = -2 + common.renderingMode = -1 + common.measureFps = false + common.orthoProjection = false + common.aspectRatio = -1.0 + common.polar = false + common.horizontalAspectRatio = -2 + common.reflection = false + common.reflectivity = -1.0 + compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode") + compare(common.theme.type, Theme3D.ThemeRetro, "theme") + compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode") + compare(common.aspectRatio, 1.0, "aspectRatio") + compare(common.horizontalAspectRatio, 1.0, "horizontalAspectRatio") + compare(common.reflectivity, 1.0, "reflectivity") + waitForRendering(top) + } + } + + TestCase { + name: "Bars3D Common Initialized" + when: windowShown + + function test_1_common_initialized() { if (Qt.platform.os === "android") return; constructCommonInit() + if (common_init.shadowsSupported === false) // This test is flaky on VM, use shadowsSupported to detect being run in VM + return; compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") - if (common_init.shadowsSupported === true) { - tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityLow) - compare(common_init.msaaSamples, 2, "msaaSamples") - } else { - tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityNone) - compare(common_init.msaaSamples, 0, "msaaSamples") - } + tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityLow) + compare(common_init.msaaSamples, 2, "msaaSamples") compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme") compare(common_init.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common_init.measureFps, true, "measureFps") @@ -259,31 +277,6 @@ compare(common_init.locale, Qt.locale("UK"), "locale") compare(common_init.margin, 0.2, "margin") waitForRendering(top) - common_init.destroy(); - waitForRendering(top) - } - - function test_4_change_invalid_common() { - if (Qt.platform.os === "android") - return; - - common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice - common.theme.type = -2 - common.renderingMode = -1 - common.measureFps = false - common.orthoProjection = false - common.aspectRatio = -1.0 - common.polar = false - common.horizontalAspectRatio = -2 - common.reflection = false - common.reflectivity = -1.0 - compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode") - compare(common.theme.type, Theme3D.ThemeRetro, "theme") - compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode") - compare(common.aspectRatio, 1.0, "aspectRatio") - compare(common.horizontalAspectRatio, 1.0, "horizontalAspectRatio") - compare(common.reflectivity, 1.0, "reflectivity") - waitForRendering(top) } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/qmltest/scatter3d/tst_basic.qml new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/qmltest/scatter3d/tst_basic.qml --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/qmltest/scatter3d/tst_basic.qml 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/qmltest/scatter3d/tst_basic.qml 2023-10-04 00:00:42.000000000 +0200 @@ -86,8 +86,6 @@ compare(empty.axisZ.type, AbstractAxis3D.AxisTypeValue) compare(empty.axisY.type, AbstractAxis3D.AxisTypeValue) waitForRendering(top) - empty.destroy() - waitForRendering(top) } } @@ -100,8 +98,6 @@ compare(basic.width, 150, "width") compare(basic.height, 150, "height") waitForRendering(top) - basic.destroy() - waitForRendering(top) } } @@ -114,12 +110,12 @@ return; constructCommon() + if (common.shadowsSupported === false) + return; + compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode") compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality") - if (common.shadowsSupported === true) - compare(common.msaaSamples, 4, "msaaSamples") - else - compare(common.msaaSamples, 0, "msaaSamples") + compare(common.msaaSamples, 4, "msaaSamples") compare(common.theme.type, Theme3D.ThemeQt, "theme") compare(common.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common.measureFps, false, "measureFps") @@ -140,17 +136,14 @@ } function test_2_change_common() { - if (Qt.platform.os === "android") + if (Qt.platform.os === "android" || common.shadowsSupported === false) return; common.selectionMode = AbstractGraph3D.SelectionNone common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh - compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") common.msaaSamples = 8 - if (common.shadowsSupported === true) - compare(common.msaaSamples, 8, "msaaSamples") - else - compare(common.msaaSamples, 0, "msaaSamples") + compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") + compare(common.msaaSamples, 8, "msaaSamples") common.theme.type = Theme3D.ThemeRetro common.renderingMode = AbstractGraph3D.RenderDirectToBackground_NoClear common.measureFps = true @@ -183,20 +176,45 @@ waitForRendering(top) } - function test_3_common_initialized() { + function test_3_change_invalid_common() { + if (Qt.platform.os === "android" || common.shadowsSupported === false) + return; + + common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice + common.theme.type = -2 + common.renderingMode = -1 + common.measureFps = false + common.orthoProjection = false + common.aspectRatio = -1.0 + common.polar = false + common.horizontalAspectRatio = -2 + common.reflection = false + common.reflectivity = -1.0 + compare(common.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") + compare(common.theme.type, Theme3D.ThemeRetro, "theme") + compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode") + compare(common.aspectRatio, 1.0, "aspectRatio") + compare(common.horizontalAspectRatio, 1.0, "horizontalAspectRatio") + compare(common.reflectivity, 1.0, "reflectivity") + waitForRendering(top) + } + } + + TestCase { + name: "Scatter3D Common Initialized" + when: windowShown + + function test_1_common_initialized() { if (Qt.platform.os === "android") return; constructCommonInit() + if (common_init.shadowsSupported === false) + return; compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") - if (common_init.shadowsSupported === true) { - tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityLow) - compare(common_init.msaaSamples, 2, "msaaSamples") - } else { - tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityNone) - compare(common_init.msaaSamples, 0, "msaaSamples") - } + tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityLow) + compare(common_init.msaaSamples, 2, "msaaSamples") compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme") compare(common_init.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common_init.measureFps, true, "measureFps") @@ -212,31 +230,6 @@ compare(common_init.locale, Qt.locale("UK"), "locale") compare(common_init.margin, 0.2, "margin") waitForRendering(top) - common_init.destroy(); - waitForRendering(top) - } - - function test_4_change_invalid_common() { - if (Qt.platform.os === "android") - return; - - common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice - common.theme.type = -2 - common.renderingMode = -1 - common.measureFps = false - common.orthoProjection = false - common.aspectRatio = -1.0 - common.polar = false - common.horizontalAspectRatio = -2 - common.reflection = false - common.reflectivity = -1.0 - compare(common.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") - compare(common.theme.type, Theme3D.ThemeRetro, "theme") - compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode") - compare(common.aspectRatio, 1.0, "aspectRatio") - compare(common.horizontalAspectRatio, 1.0, "horizontalAspectRatio") - compare(common.reflectivity, 1.0, "reflectivity") - waitForRendering(top) } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/qmltest/surface3d/tst_basic.qml new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/qmltest/surface3d/tst_basic.qml --- old/qtdatavis3d-everywhere-src-6.5.3/tests/auto/qmltest/surface3d/tst_basic.qml 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/auto/qmltest/surface3d/tst_basic.qml 2023-10-04 00:00:42.000000000 +0200 @@ -88,8 +88,6 @@ compare(empty.axisZ.type, AbstractAxis3D.AxisTypeValue) compare(empty.axisY.type, AbstractAxis3D.AxisTypeValue) waitForRendering(top) - empty.destroy() - waitForRendering(top) } } @@ -108,8 +106,6 @@ basic.flipHorizontalGrid = false compare(basic.flipHorizontalGrid, false, "flipHorizontalGrid") waitForRendering(top) - basic.destroy() - waitForRendering(top) } } @@ -122,12 +118,12 @@ return; constructCommon() + if (common.shadowsSupported === false) + return; + compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode") compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality") - if (common.shadowsSupported === true) - compare(common.msaaSamples, 4, "msaaSamples") - else - compare(common.msaaSamples, 0, "msaaSamples") + compare(common.msaaSamples, 4, "msaaSamples") compare(common.theme.type, Theme3D.ThemeQt, "theme") compare(common.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common.measureFps, false, "measureFps") @@ -148,17 +144,14 @@ } function test_2_change_common() { - if (Qt.platform.os === "android") + if (Qt.platform.os === "android" || common.shadowsSupported === false) return; common.selectionMode = AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh - compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") common.msaaSamples = 8 - if (common.shadowsSupported === true) - compare(common.msaaSamples, 8, "msaaSamples") - else - compare(common.msaaSamples, 0, "msaaSamples") + compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") + compare(common.msaaSamples, 8, "msaaSamples") common.theme.type = Theme3D.ThemeRetro common.renderingMode = AbstractGraph3D.RenderDirectToBackground_NoClear common.measureFps = true @@ -191,20 +184,45 @@ waitForRendering(top) } - function test_3_common_initialized() { + function test_3_change_invalid_common() { + if (Qt.platform.os === "android" || common.shadowsSupported === false) + return; + + common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice + common.theme.type = -2 + common.renderingMode = -1 + common.measureFps = false + common.orthoProjection = false + common.aspectRatio = -1.0 + common.polar = false + common.horizontalAspectRatio = -2 + common.reflection = false + common.reflectivity = -1.0 + compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode") + compare(common.theme.type, Theme3D.ThemeRetro, "theme") + compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode") + compare(common.aspectRatio, 1.0, "aspectRatio") + compare(common.horizontalAspectRatio, 1.0, "horizontalAspectRatio") + compare(common.reflectivity, 1.0, "reflectivity") + waitForRendering(top) + } + } + + TestCase { + name: "Surface3D Common Initialized" + when: windowShown + + function test_1_common_initialized() { if (Qt.platform.os === "android") return; constructCommonInit() + if (common_init.shadowsSupported === false) + return; compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") - if (common_init.shadowsSupported === true) { - tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityLow) - compare(common_init.msaaSamples, 2, "msaaSamples") - } else { - tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityNone) - compare(common_init.msaaSamples, 0, "msaaSamples") - } + tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityLow) + compare(common_init.msaaSamples, 2, "msaaSamples") compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme") compare(common_init.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common_init.measureFps, true, "measureFps") @@ -220,31 +238,6 @@ compare(common_init.locale, Qt.locale("UK"), "locale") compare(common_init.margin, 0.2, "margin") waitForRendering(top) - common_init.destroy(); - waitForRendering(top) - } - - function test_4_change_invalid_common() { - if (Qt.platform.os === "android") - return; - - common.selectionMode = AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionColumn | AbstractGraph3D.SelectionSlice - common.theme.type = -2 - common.renderingMode = -1 - common.measureFps = false - common.orthoProjection = false - common.aspectRatio = -1.0 - common.polar = false - common.horizontalAspectRatio = -2 - common.reflection = false - common.reflectivity = -1.0 - compare(common.selectionMode, AbstractGraph3D.SelectionItem | AbstractGraph3D.SelectionRow | AbstractGraph3D.SelectionSlice, "selectionMode") - compare(common.theme.type, Theme3D.ThemeRetro, "theme") - compare(common.renderingMode, AbstractGraph3D.RenderDirectToBackground_NoClear, "renderingMode") - compare(common.aspectRatio, 1.0, "aspectRatio") - compare(common.horizontalAspectRatio, 1.0, "horizontalAspectRatio") - compare(common.reflectivity, 1.0, "reflectivity") - waitForRendering(top) } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/manual/qmlvolume/datasource.cpp new/qtdatavis3d-everywhere-src-6.6.0/tests/manual/qmlvolume/datasource.cpp --- old/qtdatavis3d-everywhere-src-6.5.3/tests/manual/qmlvolume/datasource.cpp 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/manual/qmlvolume/datasource.cpp 2023-10-04 00:00:42.000000000 +0200 @@ -24,7 +24,7 @@ // This can take a while if the dimensions are large, so we support incremental data generation. int index = 0; - int textureSize = 256; + int textureSize = 1024; QVector3D midPoint(float(textureSize) / 2.0f, float(textureSize) / 2.0f, float(textureSize) / 2.0f); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.3/tests/manual/qmlvolume/qml/qmlvolume/main.qml new/qtdatavis3d-everywhere-src-6.6.0/tests/manual/qmlvolume/qml/qmlvolume/main.qml --- old/qtdatavis3d-everywhere-src-6.5.3/tests/manual/qmlvolume/qml/qmlvolume/main.qml 2023-09-24 13:38:50.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.6.0/tests/manual/qmlvolume/qml/qmlvolume/main.qml 2023-10-04 00:00:42.000000000 +0200 @@ -34,7 +34,7 @@ itemLabelVisible: false onItemLabelChanged: { - if (surfaceSeries.selectedPoint === surfaceSeries.invalidSelectionPosition) + if (surfaceSeries.selectedPoint == surfaceSeries.invalidSelectionPosition) selectionText.text = "No selection" else selectionText.text = surfaceSeries.itemLabel @@ -101,7 +101,7 @@ text: "Slice" onClicked: { - if (volumeItem.sliceIndexZ == -1) { + if (volumeItem.sliceIndexZ === -1) { volumeItem.sliceIndexZ = 128 volumeItem.drawSlices = true volumeItem.drawSliceFrames = true @@ -123,7 +123,27 @@ } } } + } + + SequentialAnimation { + running: volumeItem.drawSlices + loops: Animation.Infinite + + PropertyAnimation { + target: volumeItem + property: "sliceIndexZ" + from: 0 + to: 1024 + duration: 5000 + } + PropertyAnimation { + target: volumeItem + property: "sliceIndexZ" + from: 1024 + to: 0 + duration: 5000 + } } Custom3DVolume {
