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-07-26 13:22:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-datavis3d (Old) and /work/SRC/openSUSE:Factory/.qt6-datavis3d.new.15225 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-datavis3d" Wed Jul 26 13:22:31 2023 rev:20 rq:1099988 version:6.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-datavis3d/qt6-datavis3d.changes 2023-07-08 22:47:08.291121544 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-datavis3d.new.15225/qt6-datavis3d.changes 2023-07-26 13:22:53.607635746 +0200 @@ -1,0 +2,6 @@ +Thu Jul 20 08:47:58 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.5.2 + * https://www.qt.io/blog/qt-6.5.2-released-1 + +------------------------------------------------------------------- Old: ---- qtdatavis3d-everywhere-src-6.5.1.tar.xz New: ---- qtdatavis3d-everywhere-src-6.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-datavis3d.spec ++++++ --- /var/tmp/diff_new_pack.gZE1W2/_old 2023-07-26 13:22:54.287639595 +0200 +++ /var/tmp/diff_new_pack.gZE1W2/_new 2023-07-26 13:22:54.291639618 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.5.1 +%define real_version 6.5.2 %define short_version 6.5 %define short_name qtdatavis3d %define tar_name qtdatavis3d-everywhere-src @@ -28,12 +28,12 @@ %endif # Name: qt6-datavis3d%{?pkg_suffix} -Version: 6.5.1 +Version: 6.5.2 Release: 0 Summary: Qt 6 data visualization framework License: GPL-3.0-or-later URL: https://www.qt.io -Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz +Source: https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-datavis3d-rpmlintrc BuildRequires: pkgconfig BuildRequires: qt6-qml-private-devel ++++++ qtdatavis3d-everywhere-src-6.5.1.tar.xz -> qtdatavis3d-everywhere-src-6.5.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/.cmake.conf new/qtdatavis3d-everywhere-src-6.5.2/.cmake.conf --- old/qtdatavis3d-everywhere-src-6.5.1/.cmake.conf 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/.cmake.conf 2023-07-07 18:22:21.000000000 +0200 @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.5.1") +set(QT_REPO_MODULE_VERSION "6.5.2") 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.1/.tag new/qtdatavis3d-everywhere-src-6.5.2/.tag --- old/qtdatavis3d-everywhere-src-6.5.1/.tag 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/.tag 2023-07-07 18:22:21.000000000 +0200 @@ -1 +1 @@ -46c0f385a3c3255257440c095e0f02970b6a27a1 +115e46d333a059b39f45a5df582b43b90ded9399 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/CMakeLists.txt new/qtdatavis3d-everywhere-src-6.5.2/CMakeLists.txt --- old/qtdatavis3d-everywhere-src-6.5.1/CMakeLists.txt 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/CMakeLists.txt 2023-07-07 18:22:21.000000000 +0200 @@ -14,6 +14,7 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals) find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Core OpenGL Quick Qml Gui Widgets QuickTest Test) +qt_internal_project_setup() macro(assertTargets) foreach(qtTarget IN ITEMS ${ARGN}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/conanfile.py new/qtdatavis3d-everywhere-src-6.5.2/conanfile.py --- old/qtdatavis3d-everywhere-src-6.5.1/conanfile.py 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/conanfile.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -# Copyright (C) 2021 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -from conans import ConanFile -import re -from pathlib import Path - - -def _parse_qt_version_by_key(key: str) -> str: - with open(Path(__file__).parent.resolve() / ".cmake.conf") as f: - m = re.search(fr'{key} .*"(.*)"', f.read()) - return m.group(1) if m else "" - - -def _get_qt_minor_version() -> str: - return ".".join(_parse_qt_version_by_key("QT_REPO_MODULE_VERSION").split(".")[:2]) - - -class QtDataVisualization(ConanFile): - name = "qtdatavis3d" - license = "GPL-3.0+, Commercial Qt License Agreement" - author = "The Qt Company <https://www.qt.io/contact-us>" - url = "https://code.qt.io/cgit/qt/qtdatavis3d.git"; - description = ( - "Qt Data Visualization provides UI Components for displaying 3D graphs, driven by static or " - "dynamic data models." - ) - topics = "qt", "qt6", "data visualization", "qtquick" - settings = "os", "compiler", "arch", "build_type" - # for referencing the version number and prerelease tag and dependencies info - exports = ".cmake.conf", "dependencies.yaml" - exports_sources = "*", "!conan*.*" - python_requires = f"qt-conan-common/{_get_qt_minor_version()}@qt/everywhere" - python_requires_extend = "qt-conan-common.QtLeafModule" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/dependencies.yaml new/qtdatavis3d-everywhere-src-6.5.2/dependencies.yaml --- old/qtdatavis3d-everywhere-src-6.5.1/dependencies.yaml 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/dependencies.yaml 2023-07-07 18:22:21.000000000 +0200 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: 55aee8697512af105dfefabc1e2ec41d4df1e45e + ref: af457a9f0f7eb1a2a7d11f495da508faab91a442 required: true ../qtdeclarative: - ref: 65651dc1d333e2aded18b0d6f0b71c35e5b40c1c + ref: f289063ff19588a11dd79213632785cfda2909a0 required: false ../qtmultimedia: - ref: 9aeba9885bcaeb678808f38a71191da1114a7e1d + ref: ca330332aae05023983dcf445f0b388070289c51 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/bargraph.cpp new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/bargraph.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/bargraph.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/bargraph.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -32,7 +32,7 @@ //! [1] m_barsWidget = new QWidget; - QHBoxLayout *hLayout = new QHBoxLayout(m_barsWidget); + auto *hLayout = new QHBoxLayout(m_barsWidget); m_container = QWidget::createWindowContainer(m_barsGraph, m_barsWidget); m_barsGraph->resize(minimumGraphSize); m_container->setMinimumSize(minimumGraphSize); @@ -41,11 +41,11 @@ m_container->setFocusPolicy(Qt::StrongFocus); hLayout->addWidget(m_container, 1); - QVBoxLayout *vLayout = new QVBoxLayout(); + auto *vLayout = new QVBoxLayout(); hLayout->addLayout(vLayout); //! [1] - QComboBox *themeList = new QComboBox(m_barsWidget); + auto *themeList = new QComboBox(m_barsWidget); themeList->addItem(u"Qt"_s); themeList->addItem(u"Primary Colors"_s); themeList->addItem(u"Digia"_s); @@ -56,14 +56,14 @@ themeList->addItem(u"Isabelle"_s); themeList->setCurrentIndex(0); - QPushButton *labelButton = new QPushButton(m_barsWidget); + auto *labelButton = new QPushButton(m_barsWidget); labelButton->setText(u"Change label style"_s); - QCheckBox *smoothCheckBox = new QCheckBox(m_barsWidget); + auto *smoothCheckBox = new QCheckBox(m_barsWidget); smoothCheckBox->setText(u"Smooth bars"_s); smoothCheckBox->setChecked(false); - QComboBox *barStyleList = new QComboBox(m_barsWidget); + auto *barStyleList = new QComboBox(m_barsWidget); barStyleList->addItem(u"Bar"_s, QAbstract3DSeries::MeshBar); barStyleList->addItem(u"Pyramid"_s, QAbstract3DSeries::MeshPyramid); barStyleList->addItem(u"Cone"_s, QAbstract3DSeries::MeshCone); @@ -72,13 +72,13 @@ barStyleList->addItem(u"Sphere"_s, QAbstract3DSeries::MeshSphere); barStyleList->setCurrentIndex(4); - QPushButton *cameraButton = new QPushButton(m_barsWidget); + auto *cameraButton = new QPushButton(m_barsWidget); cameraButton->setText(u"Change camera preset"_s); - QPushButton *zoomToSelectedButton = new QPushButton(m_barsWidget); + auto *zoomToSelectedButton = new QPushButton(m_barsWidget); zoomToSelectedButton->setText(u"Zoom to selected bar"_s); - QComboBox *selectionModeList = new QComboBox(m_barsWidget); + auto *selectionModeList = new QComboBox(m_barsWidget); selectionModeList->addItem(u"None"_s, int(QAbstract3DGraph::SelectionNone)); selectionModeList->addItem(u"Bar"_s, @@ -114,52 +114,52 @@ | QAbstract3DGraph::SelectionMultiSeries)); selectionModeList->setCurrentIndex(1); - QCheckBox *backgroundCheckBox = new QCheckBox(m_barsWidget); + auto *backgroundCheckBox = new QCheckBox(m_barsWidget); backgroundCheckBox->setText(u"Show background"_s); backgroundCheckBox->setChecked(false); - QCheckBox *gridCheckBox = new QCheckBox(m_barsWidget); + auto *gridCheckBox = new QCheckBox(m_barsWidget); gridCheckBox->setText(u"Show grid"_s); gridCheckBox->setChecked(true); - QCheckBox *seriesCheckBox = new QCheckBox(m_barsWidget); + auto *seriesCheckBox = new QCheckBox(m_barsWidget); seriesCheckBox->setText(u"Show second series"_s); seriesCheckBox->setChecked(false); - QCheckBox *reverseValueAxisCheckBox = new QCheckBox(m_barsWidget); + auto *reverseValueAxisCheckBox = new QCheckBox(m_barsWidget); reverseValueAxisCheckBox->setText(u"Reverse value axis"_s); reverseValueAxisCheckBox->setChecked(false); - QCheckBox *reflectionCheckBox = new QCheckBox(m_barsWidget); + auto *reflectionCheckBox = new QCheckBox(m_barsWidget); reflectionCheckBox->setText(u"Show reflections"_s); reflectionCheckBox->setChecked(false); //! [3] - QSlider *rotationSliderX = new QSlider(Qt::Horizontal, m_barsWidget); + auto *rotationSliderX = new QSlider(Qt::Horizontal, m_barsWidget); rotationSliderX->setTickInterval(30); rotationSliderX->setTickPosition(QSlider::TicksBelow); rotationSliderX->setMinimum(-180); rotationSliderX->setValue(0); rotationSliderX->setMaximum(180); //! [3] - QSlider *rotationSliderY = new QSlider(Qt::Horizontal, m_barsWidget); + auto *rotationSliderY = new QSlider(Qt::Horizontal, m_barsWidget); rotationSliderY->setTickInterval(15); rotationSliderY->setTickPosition(QSlider::TicksAbove); rotationSliderY->setMinimum(-90); rotationSliderY->setValue(0); rotationSliderY->setMaximum(90); - QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, m_barsWidget); + auto *fontSizeSlider = new QSlider(Qt::Horizontal, m_barsWidget); fontSizeSlider->setTickInterval(10); fontSizeSlider->setTickPosition(QSlider::TicksBelow); fontSizeSlider->setMinimum(1); fontSizeSlider->setValue(30); fontSizeSlider->setMaximum(100); - QFontComboBox *fontList = new QFontComboBox(m_barsWidget); + auto *fontList = new QFontComboBox(m_barsWidget); fontList->setCurrentFont(QFont("Times New Roman")); - QComboBox *shadowQuality = new QComboBox(m_barsWidget); + auto *shadowQuality = new QComboBox(m_barsWidget); shadowQuality->addItem(u"None"_s); shadowQuality->addItem(u"Low"_s); shadowQuality->addItem(u"Medium"_s); @@ -169,7 +169,7 @@ shadowQuality->addItem(u"High Soft"_s); shadowQuality->setCurrentIndex(5); - QComboBox *rangeList = new QComboBox(m_barsWidget); + auto *rangeList = new QComboBox(m_barsWidget); rangeList->addItem(u"2015"_s); rangeList->addItem(u"2016"_s); rangeList->addItem(u"2017"_s); @@ -181,25 +181,25 @@ rangeList->addItem(u"All"_s); rangeList->setCurrentIndex(8); - QCheckBox *axisTitlesVisibleCB = new QCheckBox(m_barsWidget); + auto *axisTitlesVisibleCB = new QCheckBox(m_barsWidget); axisTitlesVisibleCB->setText(u"Axis titles visible"_s); axisTitlesVisibleCB->setChecked(true); - QCheckBox *axisTitlesFixedCB = new QCheckBox(m_barsWidget); + auto *axisTitlesFixedCB = new QCheckBox(m_barsWidget); axisTitlesFixedCB->setText(u"Axis titles fixed"_s); axisTitlesFixedCB->setChecked(true); - QSlider *axisLabelRotationSlider = new QSlider(Qt::Horizontal, m_barsWidget); + auto *axisLabelRotationSlider = new QSlider(Qt::Horizontal, m_barsWidget); axisLabelRotationSlider->setTickInterval(10); axisLabelRotationSlider->setTickPosition(QSlider::TicksBelow); axisLabelRotationSlider->setMinimum(0); axisLabelRotationSlider->setValue(30); axisLabelRotationSlider->setMaximum(90); - QButtonGroup *modeGroup = new QButtonGroup(m_barsWidget); - QRadioButton *modeWeather = new QRadioButton(u"Temperature Data"_s, m_barsWidget); + auto *modeGroup = new QButtonGroup(m_barsWidget); + auto *modeWeather = new QRadioButton(u"Temperature Data"_s, m_barsWidget); modeWeather->setChecked(true); - QRadioButton *modeCustomProxy = new QRadioButton(u"Custom Proxy Data"_s, m_barsWidget); + auto *modeCustomProxy = new QRadioButton(u"Custom Proxy Data"_s, m_barsWidget); modeGroup->addButton(modeWeather); modeGroup->addButton(modeCustomProxy); @@ -240,7 +240,7 @@ vLayout->addWidget(modeCustomProxy, 1, Qt::AlignTop); //! [2] - GraphModifier *modifier = new GraphModifier(m_barsGraph, this); + auto *modifier = new GraphModifier(m_barsGraph, this); //! [2] //! [5] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/graphmodifier.cpp new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/graphmodifier.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/graphmodifier.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/graphmodifier.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -159,16 +159,14 @@ // Create data arrays //! [9b] - QBarDataArray *dataSet = new QBarDataArray; - QBarDataArray *dataSet2 = new QBarDataArray; - QBarDataRow *dataRow = nullptr; - QBarDataRow *dataRow2= nullptr; + auto *dataSet = new QBarDataArray; + auto *dataSet2 = new QBarDataArray; dataSet->reserve(m_years.size()); for (qsizetype year = 0; year < m_years.size(); ++year) { // Create a data row - dataRow = new QBarDataRow(m_months.size()); - dataRow2 = new QBarDataRow(m_months.size()); + auto *dataRow = new QBarDataRow(m_months.size()); + auto *dataRow2 = new QBarDataRow(m_months.size()); for (qsizetype month = 0; month < m_months.size(); ++month) { // Add data to the row (*dataRow)[month].setValue(tempOulu[year][month]); @@ -195,7 +193,7 @@ void GraphModifier::changeStyle(int style) { - QComboBox *comboBox = qobject_cast<QComboBox *>(sender()); + auto *comboBox = qobject_cast<QComboBox *>(sender()); if (comboBox) { m_barMesh = comboBox->itemData(style).value<QAbstract3DSeries::Mesh>(); m_primarySeries->setMesh(m_barMesh); @@ -241,7 +239,7 @@ void GraphModifier::changeSelectionMode(int selectionMode) { - QComboBox *comboBox = qobject_cast<QComboBox *>(sender()); + auto *comboBox = qobject_cast<QComboBox *>(sender()); if (comboBox) { int flags = comboBox->itemData(selectionMode).toInt(); m_graph->setSelectionMode(QAbstract3DGraph::SelectionFlags(flags)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/highlightseries.cpp new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/highlightseries.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/highlightseries.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/highlightseries.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -63,10 +63,10 @@ QSurfaceDataProxy *srcProxy = m_topographicSeries->dataProxy(); const QSurfaceDataArray &srcArray = *srcProxy->array(); - QSurfaceDataArray *dataArray = new QSurfaceDataArray; + auto *dataArray = new QSurfaceDataArray; dataArray->reserve(endZ - startZ); for (int i = startZ; i < endZ; ++i) { - QSurfaceDataRow *newRow = new QSurfaceDataRow; + auto *newRow = new QSurfaceDataRow; newRow->reserve(endX - startX); QSurfaceDataRow *srcRow = srcArray.at(i); for (int j = startX; j < endX; ++j) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/rainfalldata.cpp new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/rainfalldata.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/rainfalldata.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/rainfalldata.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -76,7 +76,7 @@ { // Create a new variant data set and data item list m_dataSet = new VariantDataSet; - VariantDataItemList *itemList = new VariantDataItemList; + auto *itemList = new VariantDataItemList; // Read data from a data file into the data item list QFile dataFile(":/data/raindata.txt"); @@ -94,7 +94,7 @@ } // Store year and month as strings, and rainfall value as double // into a variant data item and add the item to the item list. - VariantDataItem *newItem = new VariantDataItem; + auto *newItem = new VariantDataItem; for (int i = 0; i < 2; ++i) newItem->append(strList.at(i).trimmed().toString()); newItem->append(strList.at(2).trimmed().toDouble()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/scatterdatamodifier.cpp new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/scatterdatamodifier.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/scatterdatamodifier.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/scatterdatamodifier.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -38,8 +38,8 @@ //! [0] //! [1] - QScatterDataProxy *proxy = new QScatterDataProxy; - QScatter3DSeries *series = new QScatter3DSeries(proxy); + auto *proxy = new QScatterDataProxy; + auto *series = new QScatter3DSeries(proxy); series->setItemLabelFormat(u"@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel"_s); series->setMeshSmooth(m_smooth); m_graph->addSeries(series); @@ -70,7 +70,7 @@ //! [3] //! [4] - QScatterDataArray *dataArray = new QScatterDataArray; + auto *dataArray = new QScatterDataArray; dataArray->reserve(m_itemCount); //! [4] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/scattergraph.cpp new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/scattergraph.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/scattergraph.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/scattergraph.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -25,7 +25,7 @@ return false; m_scatterWidget = new QWidget; - QHBoxLayout *hLayout = new QHBoxLayout(m_scatterWidget); + auto *hLayout = new QHBoxLayout(m_scatterWidget); m_container = QWidget::createWindowContainer(m_scatterGraph, m_scatterWidget); m_container->setMinimumSize(minimumGraphSize); m_container->setMaximumSize(maximumGraphSize); @@ -33,44 +33,44 @@ m_container->setFocusPolicy(Qt::StrongFocus); hLayout->addWidget(m_container, 1); - QVBoxLayout *vLayout = new QVBoxLayout(); + auto *vLayout = new QVBoxLayout(); hLayout->addLayout(vLayout); - QCommandLinkButton *cameraButton = new QCommandLinkButton(m_scatterWidget); + auto *cameraButton = new QCommandLinkButton(m_scatterWidget); cameraButton->setText(u"Change camera preset"_s); cameraButton->setDescription(u"Switch between a number of preset camera positions"_s); cameraButton->setIconSize(QSize(0, 0)); - QCommandLinkButton *itemCountButton = new QCommandLinkButton(m_scatterWidget); + auto *itemCountButton = new QCommandLinkButton(m_scatterWidget); itemCountButton->setText(u"Toggle item count"_s); itemCountButton->setDescription(u"Switch between 900 and 10000 data points"_s); itemCountButton->setIconSize(QSize(0, 0)); - QCommandLinkButton *rangeButton = new QCommandLinkButton(m_scatterWidget); + auto *rangeButton = new QCommandLinkButton(m_scatterWidget); rangeButton->setText(u"Toggle axis ranges"_s); rangeButton->setDescription(u"Switch between automatic axis ranges and preset ranges"_s); rangeButton->setIconSize(QSize(0, 0)); - QCheckBox *backgroundCheckBox = new QCheckBox(m_scatterWidget); + auto *backgroundCheckBox = new QCheckBox(m_scatterWidget); backgroundCheckBox->setText(u"Show background"_s); backgroundCheckBox->setChecked(true); - QCheckBox *gridCheckBox = new QCheckBox(m_scatterWidget); + auto *gridCheckBox = new QCheckBox(m_scatterWidget); gridCheckBox->setText(u"Show grid"_s); gridCheckBox->setChecked(true); - QCheckBox *smoothCheckBox = new QCheckBox(m_scatterWidget); + auto *smoothCheckBox = new QCheckBox(m_scatterWidget); smoothCheckBox->setText(u"Smooth dots"_s); smoothCheckBox->setChecked(true); - QComboBox *itemStyleList = new QComboBox(m_scatterWidget); + auto *itemStyleList = new QComboBox(m_scatterWidget); itemStyleList->addItem(u"Sphere"_s, QAbstract3DSeries::MeshSphere); itemStyleList->addItem(u"Cube"_s, QAbstract3DSeries::MeshCube); itemStyleList->addItem(u"Minimal"_s, QAbstract3DSeries::MeshMinimal); itemStyleList->addItem(u"Point"_s, QAbstract3DSeries::MeshPoint); itemStyleList->setCurrentIndex(0); - QComboBox *themeList = new QComboBox(m_scatterWidget); + auto *themeList = new QComboBox(m_scatterWidget); themeList->addItem(u"Qt"_s); themeList->addItem(u"Primary Colors"_s); themeList->addItem(u"Digia"_s); @@ -81,7 +81,7 @@ themeList->addItem(u"Isabelle"_s); themeList->setCurrentIndex(3); - QComboBox *shadowQuality = new QComboBox(m_scatterWidget); + auto *shadowQuality = new QComboBox(m_scatterWidget); shadowQuality->addItem(u"None"_s); shadowQuality->addItem(u"Low"_s); shadowQuality->addItem(u"Medium"_s); @@ -104,7 +104,7 @@ vLayout->addWidget(new QLabel(u"Adjust shadow quality"_s)); vLayout->addWidget(shadowQuality, 1, Qt::AlignTop); - ScatterDataModifier *modifier = new ScatterDataModifier(m_scatterGraph, this); + auto *modifier = new ScatterDataModifier(m_scatterGraph, this); QObject::connect(cameraButton, &QCommandLinkButton::clicked, modifier, &ScatterDataModifier::changePresetCamera); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/surfacegraph.cpp new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/surfacegraph.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/surfacegraph.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/surfacegraph.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -87,7 +87,7 @@ return false; m_surfaceWidget = new QWidget; - QHBoxLayout *hLayout = new QHBoxLayout(m_surfaceWidget); + auto *hLayout = new QHBoxLayout(m_surfaceWidget); m_container = QWidget::createWindowContainer(m_surfaceGraph, m_surfaceWidget); m_container->setMinimumSize(minimumGraphSize); m_container->setMaximumSize(maximumGraphSize); @@ -95,76 +95,76 @@ m_container->setFocusPolicy(Qt::StrongFocus); hLayout->addWidget(m_container, 1); - QVBoxLayout *vLayout = new QVBoxLayout(); + auto *vLayout = new QVBoxLayout(); hLayout->addLayout(vLayout); vLayout->setAlignment(Qt::AlignTop); // Create control widgets - QGroupBox *modelGroupBox = new QGroupBox(u"Model"_s); + auto *modelGroupBox = new QGroupBox(u"Model"_s); - QRadioButton *sqrtSinModelRB = new QRadioButton(m_surfaceWidget); + auto *sqrtSinModelRB = new QRadioButton(m_surfaceWidget); sqrtSinModelRB->setText(u"Sqrt && Sin"_s); sqrtSinModelRB->setChecked(false); - QRadioButton *heightMapModelRB = new QRadioButton(m_surfaceWidget); + auto *heightMapModelRB = new QRadioButton(m_surfaceWidget); heightMapModelRB->setText(u"Multiseries\nHeight Map"_s); heightMapModelRB->setChecked(false); - QRadioButton *texturedModelRB = new QRadioButton(m_surfaceWidget); + auto *texturedModelRB = new QRadioButton(m_surfaceWidget); texturedModelRB->setText(u"Textured\nTopography"_s); texturedModelRB->setChecked(false); - QVBoxLayout *modelVBox = new QVBoxLayout; + auto *modelVBox = new QVBoxLayout; modelVBox->addWidget(sqrtSinModelRB); modelVBox->addWidget(heightMapModelRB); modelVBox->addWidget(texturedModelRB); modelGroupBox->setLayout(modelVBox); - QGroupBox *selectionGroupBox = new QGroupBox(u"Graph Selection Mode"_s); + auto *selectionGroupBox = new QGroupBox(u"Graph Selection Mode"_s); - QRadioButton *modeNoneRB = new QRadioButton(m_surfaceWidget); + auto *modeNoneRB = new QRadioButton(m_surfaceWidget); modeNoneRB->setText(u"No selection"_s); modeNoneRB->setChecked(false); - QRadioButton *modeItemRB = new QRadioButton(m_surfaceWidget); + auto *modeItemRB = new QRadioButton(m_surfaceWidget); modeItemRB->setText(u"Item"_s); modeItemRB->setChecked(false); - QRadioButton *modeSliceRowRB = new QRadioButton(m_surfaceWidget); + auto *modeSliceRowRB = new QRadioButton(m_surfaceWidget); modeSliceRowRB->setText(u"Row Slice"_s); modeSliceRowRB->setChecked(false); - QRadioButton *modeSliceColumnRB = new QRadioButton(m_surfaceWidget); + auto *modeSliceColumnRB = new QRadioButton(m_surfaceWidget); modeSliceColumnRB->setText(u"Column Slice"_s); modeSliceColumnRB->setChecked(false); - QVBoxLayout *selectionVBox = new QVBoxLayout; + auto *selectionVBox = new QVBoxLayout; selectionVBox->addWidget(modeNoneRB); selectionVBox->addWidget(modeItemRB); selectionVBox->addWidget(modeSliceRowRB); selectionVBox->addWidget(modeSliceColumnRB); selectionGroupBox->setLayout(selectionVBox); - QGroupBox *axisGroupBox = new QGroupBox(u"Axis ranges"_s); + auto *axisGroupBox = new QGroupBox(u"Axis ranges"_s); - QSlider *axisMinSliderX = new QSlider(Qt::Horizontal); + auto *axisMinSliderX = new QSlider(Qt::Horizontal); axisMinSliderX->setMinimum(0); axisMinSliderX->setTickInterval(1); axisMinSliderX->setEnabled(true); - QSlider *axisMaxSliderX = new QSlider(Qt::Horizontal); + auto *axisMaxSliderX = new QSlider(Qt::Horizontal); axisMaxSliderX->setMinimum(1); axisMaxSliderX->setTickInterval(1); axisMaxSliderX->setEnabled(true); - QSlider *axisMinSliderZ = new QSlider(Qt::Horizontal); + auto *axisMinSliderZ = new QSlider(Qt::Horizontal); axisMinSliderZ->setMinimum(0); axisMinSliderZ->setTickInterval(1); axisMinSliderZ->setEnabled(true); - QSlider *axisMaxSliderZ = new QSlider(Qt::Horizontal); + auto *axisMaxSliderZ = new QSlider(Qt::Horizontal); axisMaxSliderZ->setMinimum(1); axisMaxSliderZ->setTickInterval(1); axisMaxSliderZ->setEnabled(true); - QVBoxLayout *axisVBox = new QVBoxLayout; + auto *axisVBox = new QVBoxLayout; axisVBox->addWidget(new QLabel(u"Column range"_s)); axisVBox->addWidget(axisMinSliderX); axisVBox->addWidget(axisMaxSliderX); @@ -175,72 +175,71 @@ // Mode-dependent controls // sqrt-sin - QGroupBox *colorGroupBox = new QGroupBox(u"Custom gradient"_s); + auto *colorGroupBox = new QGroupBox(u"Custom gradient"_s); QPixmap pixmap = gradientBtoYPB_Pixmap(); - QPushButton *gradientBtoYPB = new QPushButton(m_surfaceWidget); + auto *gradientBtoYPB = new QPushButton(m_surfaceWidget); gradientBtoYPB->setIcon(QIcon(pixmap)); gradientBtoYPB->setIconSize(pixmap.size()); pixmap = gradientGtoRPB_Pixmap(); - QPushButton *gradientGtoRPB = new QPushButton(m_surfaceWidget); + auto *gradientGtoRPB = new QPushButton(m_surfaceWidget); gradientGtoRPB->setIcon(QIcon(pixmap)); gradientGtoRPB->setIconSize(pixmap.size()); - - QHBoxLayout *colorHBox = new QHBoxLayout; + auto *colorHBox = new QHBoxLayout; colorHBox->addWidget(gradientBtoYPB); colorHBox->addWidget(gradientGtoRPB); colorGroupBox->setLayout(colorHBox); // Multiseries heightmap - QGroupBox *showGroupBox = new QGroupBox(u"_show Object"_s); + auto *showGroupBox = new QGroupBox(u"_show Object"_s); showGroupBox->setVisible(false); - QCheckBox *checkboxShowOilRigOne = new QCheckBox(u"Oil Rig 1"_s); + auto *checkboxShowOilRigOne = new QCheckBox(u"Oil Rig 1"_s); checkboxShowOilRigOne->setChecked(true); - QCheckBox *checkboxShowOilRigTwo = new QCheckBox(u"Oil Rig 2"_s); + auto *checkboxShowOilRigTwo = new QCheckBox(u"Oil Rig 2"_s); checkboxShowOilRigTwo->setChecked(true); - QCheckBox *checkboxShowRefinery = new QCheckBox(u"Refinery"_s); + auto *checkboxShowRefinery = new QCheckBox(u"Refinery"_s); - QVBoxLayout *showVBox = new QVBoxLayout; + auto *showVBox = new QVBoxLayout; showVBox->addWidget(checkboxShowOilRigOne); showVBox->addWidget(checkboxShowOilRigTwo); showVBox->addWidget(checkboxShowRefinery); showGroupBox->setLayout(showVBox); - QGroupBox *visualsGroupBox = new QGroupBox(u"Visuals"_s); + auto *visualsGroupBox = new QGroupBox(u"Visuals"_s); visualsGroupBox->setVisible(false); - QCheckBox *checkboxVisualsSeeThrough = new QCheckBox(u"See-Through"_s); + auto *checkboxVisualsSeeThrough = new QCheckBox(u"See-Through"_s); - QCheckBox *checkboxHighlightOil = new QCheckBox(u"Highlight Oil"_s); + auto *checkboxHighlightOil = new QCheckBox(u"Highlight Oil"_s); - QCheckBox *checkboxShowShadows = new QCheckBox(u"Shadows"_s); + auto *checkboxShowShadows = new QCheckBox(u"Shadows"_s); checkboxShowShadows->setChecked(true); - QVBoxLayout *visualVBox = new QVBoxLayout; + auto *visualVBox = new QVBoxLayout; visualVBox->addWidget(checkboxVisualsSeeThrough); visualVBox->addWidget(checkboxHighlightOil); visualVBox->addWidget(checkboxShowShadows); visualsGroupBox->setLayout(visualVBox); - QLabel *labelSelection = new QLabel(u"Selection:"_s); + auto *labelSelection = new QLabel(u"Selection:"_s); labelSelection->setVisible(false); - QLabel *labelSelectedItem = new QLabel(u"Nothing"_s); + auto *labelSelectedItem = new QLabel(u"Nothing"_s); labelSelectedItem->setVisible(false); // Textured topography heightmap - QCheckBox *enableTexture = new QCheckBox(u"Surface texture"_s); + auto *enableTexture = new QCheckBox(u"Surface texture"_s); enableTexture->setVisible(false); - QLabel *label = new QLabel(m_surfaceWidget); + auto *label = new QLabel(m_surfaceWidget); label->setPixmap(highlightPixmap()); - QGroupBox *heightMapGroupBox = new QGroupBox(u"Highlight color map"_s); - QVBoxLayout *colorMapVBox = new QVBoxLayout; + auto *heightMapGroupBox = new QGroupBox(u"Highlight color map"_s); + auto *colorMapVBox = new QVBoxLayout; colorMapVBox->addWidget(label); heightMapGroupBox->setLayout(colorMapVBox); heightMapGroupBox->setVisible(false); @@ -265,7 +264,7 @@ vLayout->addWidget(enableTexture); // Create the controller - SurfaceGraphModifier *modifier = new SurfaceGraphModifier(m_surfaceGraph, labelSelectedItem, this); + auto *modifier = new SurfaceGraphModifier(m_surfaceGraph, labelSelectedItem, this); // Connect widget controls to controller QObject::connect(heightMapModelRB, &QRadioButton::toggled, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/surfacegraphmodifier.cpp new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/surfacegraphmodifier.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/surfacegraphmodifier.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/surfacegraphmodifier.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -152,10 +152,10 @@ float stepZ = (sampleMax - sampleMin) / float(sampleCountZ - 1); //! [1] - QSurfaceDataArray *dataArray = new QSurfaceDataArray; + auto *dataArray = new QSurfaceDataArray; dataArray->reserve(sampleCountZ); for (int i = 0 ; i < sampleCountZ ; ++i) { - QSurfaceDataRow *newRow = new QSurfaceDataRow; + auto *newRow = new QSurfaceDataRow; newRow->reserve(sampleCountX); // Keep values within range bounds, since just adding step can cause minor drift due // to the rounding errors. @@ -447,10 +447,10 @@ color.fill(Qt::red); //! [9] //! [11] - QCustom3DItem *item = new QCustom3DItem(":/data/oilrig.obj", positionOne, - QVector3D(0.025f, 0.025f, 0.025f), - QQuaternion::fromAxisAndAngle(0.f, 1.f, 0.f, 45.f), - color); + auto *item = new QCustom3DItem(":/data/oilrig.obj", positionOne, + QVector3D(0.025f, 0.025f, 0.025f), + QQuaternion::fromAxisAndAngle(0.f, 1.f, 0.f, 45.f), + color); //! [11] //! [12] m_graph->addCustomItem(item); @@ -463,7 +463,7 @@ m_graph->addCustomItem(item); //! [13] - QCustom3DLabel *label = new QCustom3DLabel(); + auto *label = new QCustom3DLabel(); label->setText("Oil Rig One"); label->setPosition(positionOneLabel); label->setScaling(QVector3D(1.f, 1.f, 1.f)); @@ -487,7 +487,7 @@ if (show) { QImage color = QImage(2, 2, QImage::Format_RGB32); color.fill(Qt::red); - QCustom3DItem *item = new QCustom3DItem(); + auto *item = new QCustom3DItem(); item->setMeshFile(":/data/oilrig.obj"); item->setPosition(positionTwo); item->setScaling(QVector3D(0.025f, 0.025f, 0.025f)); @@ -501,7 +501,7 @@ item->setShadowCasting(false); m_graph->addCustomItem(item); - QCustom3DLabel *label = new QCustom3DLabel(); + auto *label = new QCustom3DLabel(); label->setText("Oil Rig Two"); label->setPosition(positionTwoLabel); label->setScaling(QVector3D(1.f, 1.f, 1.f)); @@ -521,7 +521,7 @@ if (show) { QImage color = QImage(2, 2, QImage::Format_RGB32); color.fill(Qt::darkMagenta); - QCustom3DItem *item = new QCustom3DItem(); + auto *item = new QCustom3DItem(); item->setMeshFile(":/data/refinery.obj"); item->setPosition(positionThree); item->setScaling(QVector3D(0.04f, 0.04f, 0.04f)); @@ -529,7 +529,7 @@ item->setTextureImage(color); m_graph->addCustomItem(item); - QCustom3DLabel *label = new QCustom3DLabel(); + auto *label = new QCustom3DLabel(); label->setText("Refinery"); label->setPosition(positionThreeLabel); label->setScaling(QVector3D(1.f, 1.f, 1.f)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/topographicseries.cpp new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/topographicseries.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/topographicseries.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/topographicseries.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -28,12 +28,12 @@ float stepX = width / float(imageWidth); float stepZ = height / float(imageHeight); - QSurfaceDataArray *dataArray = new QSurfaceDataArray; + auto *dataArray = new QSurfaceDataArray; dataArray->reserve(imageHeight); for (int i = 0; i < imageHeight; ++i) { int p = i * widthBits; float z = height - float(i) * stepZ; - QSurfaceDataRow *newRow = new QSurfaceDataRow; + auto *newRow = new QSurfaceDataRow; newRow->reserve(imageWidth); for (int j = 0; j < imageWidth; ++j) { uchar aa = bits[p + 0]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/variantbardataproxy.cpp new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/variantbardataproxy.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/examples/datavisualization/graphgallery/variantbardataproxy.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/examples/datavisualization/graphgallery/variantbardataproxy.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -100,9 +100,9 @@ } // Create a new data array in format the parent class understands - QBarDataArray *newProxyArray = new QBarDataArray; + auto *newProxyArray = new QBarDataArray; for (const QString &rowKey : rowList) { - QBarDataRow *newProxyRow = new QBarDataRow(columnList.size()); + auto *newProxyRow = new QBarDataRow(columnList.size()); for (qsizetype i = 0; i < columnList.size(); ++i) (*newProxyRow)[i].setValue(itemValueMap[rowKey][columnList.at(i)]); newProxyArray->append(newProxyRow); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc new/qtdatavis3d-everywhere-src-6.5.2/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc --- old/qtdatavis3d-everywhere-src-6.5.1/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc 2023-07-07 18:22:21.000000000 +0200 @@ -17,4 +17,6 @@ The color property describes the color of this ThemeColor. The default color is black. + + \note Transparency is not supported and will result in undefined behavior. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc new/qtdatavis3d-everywhere-src-6.5.2/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc --- old/qtdatavis3d-everywhere-src-6.5.1/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc 2023-07-07 18:22:21.000000000 +0200 @@ -30,6 +30,8 @@ The default color is black. + \note Transparency in a gradient is not supported and will result in undefined behavior. + \sa ColorGradient */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/src/datavisualization/engine/qabstract3dgraph.cpp new/qtdatavis3d-everywhere-src-6.5.2/src/datavisualization/engine/qabstract3dgraph.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/src/datavisualization/engine/qabstract3dgraph.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/src/datavisualization/engine/qabstract3dgraph.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -15,7 +15,7 @@ #include <QtGui/QPainter> #include <QtOpenGL/QOpenGLFramebufferObject> #include <QtGui/QOffscreenSurface> -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) #include <qpa/qplatformnativeinterface.h> #endif @@ -200,7 +200,7 @@ d_ptr->renderLater(); -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) // Enable touch events for Mac touchpads typedef void * (*EnableTouch)(QWindow*, bool); EnableTouch enableTouch = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/src/datavisualization/theme/q3dtheme.cpp new/qtdatavis3d-everywhere-src-6.5.2/src/datavisualization/theme/q3dtheme.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/src/datavisualization/theme/q3dtheme.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/src/datavisualization/theme/q3dtheme.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -309,6 +309,8 @@ * \qmlproperty color Theme3D::gridLineColor * * The color of the grid lines. + * + * \note Transparency is not supported and will result in undefined behavior. */ /*! @@ -317,6 +319,8 @@ * The highlight color for a selected object. Used if * \l{AbstractGraph3D::selectionMode}{selectionMode} * has the \c AbstractGraph3D.SelectionItem flag set. + * + * \note Transparency is not supported and will result in undefined behavior. */ /*! @@ -326,6 +330,8 @@ * \l{AbstractGraph3D::selectionMode}{selectionMode} * has the \c AbstractGraph3D.SelectionRow or \c AbstractGraph3D.SelectionColumn * flag set. + * + * \note Transparency is not supported and will result in undefined behavior. */ /*! @@ -354,6 +360,8 @@ * The highlight gradient for a selected object. Used if * \l{AbstractGraph3D::selectionMode}{selectionMode} * has the \c AbstractGraph3D.SelectionItem flag set. + * + * \note Transparency is not supported and will result in undefined behavior. */ /*! @@ -363,6 +371,8 @@ * \l{AbstractGraph3D::selectionMode}{selectionMode} * has the \c AbstractGraph3D.SelectionRow or \c AbstractGraph3D.SelectionColumn * flag set. + * + * \note Transparency is not supported and will result in undefined behavior. */ /*! @@ -606,6 +616,8 @@ * \property Q3DTheme::gridLineColor * * \brief The color of the grid lines. + * + * \note Transparency is not supported and will result in undefined behavior. */ void Q3DTheme::setGridLineColor(const QColor &color) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.5.1/src/datavisualizationqml/abstractdeclarative.cpp new/qtdatavis3d-everywhere-src-6.5.2/src/datavisualizationqml/abstractdeclarative.cpp --- old/qtdatavis3d-everywhere-src-6.5.1/src/datavisualizationqml/abstractdeclarative.cpp 2023-05-16 13:44:31.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.5.2/src/datavisualizationqml/abstractdeclarative.cpp 2023-07-07 18:22:21.000000000 +0200 @@ -8,7 +8,7 @@ #if defined(Q_OS_IOS) #include <QtCore/QTimer> #endif -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) #include <qpa/qplatformnativeinterface.h> #endif @@ -428,7 +428,7 @@ if (!window) return; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) bool previousVisibility = window->isVisible(); // Enable touch events for Mac touchpads window->setVisible(true);
