diff options
73 files changed, 445 insertions, 363 deletions
diff --git a/.cmake.conf b/.cmake.conf index 2792a7d5..dc1d7a92 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,3 +1,5 @@ -set(QT_REPO_MODULE_VERSION "6.6.0") +set(QT_REPO_MODULE_VERSION "6.8.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff --git a/coin/axivion/ci_config_linux.json b/coin/axivion/ci_config_linux.json index 15cbe03d..7bf3dd7c 100644 --- a/coin/axivion/ci_config_linux.json +++ b/coin/axivion/ci_config_linux.json @@ -1,9 +1,5 @@ { "Project": { - "Git": { - "_active": true, - "sourceserver_gitdir": "/data/axivion/databases/$(env:TESTED_MODULE_COIN).git" - }, "BuildSystemIntegration": { "child_order": [ "GCCSetup", @@ -32,29 +28,14 @@ "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", + "_Version": "7.6.2", "_VersionNum": [ 7, 6, - 9999, - 11489 + 2, + 12725 ] } diff --git a/conanfile.py b/conanfile.py deleted file mode 100644 index 50a21397..00000000 --- a/conanfile.py +++ /dev/null @@ -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 --git a/dependencies.yaml b/dependencies.yaml index 309cc8e1..77867112 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: 44cfdfa7c07a4f1aa1e5b6a384418556e6b3028e + ref: 488545ca72b7f2a59401a42c2c264f38916e15d1 required: true ../qtdeclarative: - ref: b982c2146cd729e8dbfc41c33b3022b6ef702e94 + ref: 22f72aa17118346059179fc3e86a6ece7b7bfb7f required: false ../qtmultimedia: - ref: ec1747b0d18718649b1d6fd8581b55d5012a9c87 + ref: 3f831e82c5b54cdeddbc7e00c62a8a9fe048ce4f required: false diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 39981d6f..9a9782af 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause qt_examples_build_begin(EXTERNAL_BUILD) diff --git a/examples/datavisualization/CMakeLists.txt b/examples/datavisualization/CMakeLists.txt index cff70280..4e9514b1 100644 --- a/examples/datavisualization/CMakeLists.txt +++ b/examples/datavisualization/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause if(TARGET Qt::Quick) qt_internal_add_example(qmlaxishandling) diff --git a/examples/datavisualization/graphgallery/CMakeLists.txt b/examples/datavisualization/graphgallery/CMakeLists.txt index 0f16b1bc..c66fee25 100644 --- a/examples/datavisualization/graphgallery/CMakeLists.txt +++ b/examples/datavisualization/graphgallery/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2023 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(graphgallery LANGUAGES CXX) diff --git a/examples/datavisualization/graphgallery/bargraph.cpp b/examples/datavisualization/graphgallery/bargraph.cpp index 0781a5d9..5873c757 100644 --- a/examples/datavisualization/graphgallery/bargraph.cpp +++ b/examples/datavisualization/graphgallery/bargraph.cpp @@ -32,7 +32,7 @@ bool BarGraph::initialize(const QSize &minimumGraphSize, const QSize &maximumGra //! [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 @@ bool BarGraph::initialize(const QSize &minimumGraphSize, const QSize &maximumGra 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 @@ bool BarGraph::initialize(const QSize &minimumGraphSize, const QSize &maximumGra 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 @@ bool BarGraph::initialize(const QSize &minimumGraphSize, const QSize &maximumGra 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 @@ bool BarGraph::initialize(const QSize &minimumGraphSize, const QSize &maximumGra | 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 @@ bool BarGraph::initialize(const QSize &minimumGraphSize, const QSize &maximumGra 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 @@ bool BarGraph::initialize(const QSize &minimumGraphSize, const QSize &maximumGra 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 @@ bool BarGraph::initialize(const QSize &minimumGraphSize, const QSize &maximumGra vLayout->addWidget(modeCustomProxy, 1, Qt::AlignTop); //! [2] - GraphModifier *modifier = new GraphModifier(m_barsGraph, this); + auto *modifier = new GraphModifier(m_barsGraph, this); //! [2] //! [5] diff --git a/examples/datavisualization/graphgallery/graphmodifier.cpp b/examples/datavisualization/graphgallery/graphmodifier.cpp index db4b50c6..b0cb6f48 100644 --- a/examples/datavisualization/graphgallery/graphmodifier.cpp +++ b/examples/datavisualization/graphgallery/graphmodifier.cpp @@ -159,16 +159,14 @@ void GraphModifier::resetTemperatureData() // 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::changeRange(int range) 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::changeLabelBackground() 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 --git a/examples/datavisualization/graphgallery/highlightseries.cpp b/examples/datavisualization/graphgallery/highlightseries.cpp index eab1a37d..3f10b421 100644 --- a/examples/datavisualization/graphgallery/highlightseries.cpp +++ b/examples/datavisualization/graphgallery/highlightseries.cpp @@ -63,10 +63,10 @@ void HighlightSeries::handlePositionChange(const QPoint &position) 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 --git a/examples/datavisualization/graphgallery/rainfalldata.cpp b/examples/datavisualization/graphgallery/rainfalldata.cpp index 76049bec..66a2553a 100644 --- a/examples/datavisualization/graphgallery/rainfalldata.cpp +++ b/examples/datavisualization/graphgallery/rainfalldata.cpp @@ -76,7 +76,7 @@ void RainfallData::addDataSet() { // 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 @@ void RainfallData::addDataSet() } // 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 --git a/examples/datavisualization/graphgallery/scatterdatamodifier.cpp b/examples/datavisualization/graphgallery/scatterdatamodifier.cpp index 30ddcaca..1f3ec7ed 100644 --- a/examples/datavisualization/graphgallery/scatterdatamodifier.cpp +++ b/examples/datavisualization/graphgallery/scatterdatamodifier.cpp @@ -38,8 +38,8 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter, QObject *parent) : //! [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 @@ void ScatterDataModifier::addData() //! [3] //! [4] - QScatterDataArray *dataArray = new QScatterDataArray; + auto *dataArray = new QScatterDataArray; dataArray->reserve(m_itemCount); //! [4] diff --git a/examples/datavisualization/graphgallery/scattergraph.cpp b/examples/datavisualization/graphgallery/scattergraph.cpp index f075f31c..a426c10a 100644 --- a/examples/datavisualization/graphgallery/scattergraph.cpp +++ b/examples/datavisualization/graphgallery/scattergraph.cpp @@ -25,7 +25,7 @@ bool ScatterGraph::initialize(const QSize &minimumGraphSize, const QSize &maximu 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 @@ bool ScatterGraph::initialize(const QSize &minimumGraphSize, const QSize &maximu 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 @@ bool ScatterGraph::initialize(const QSize &minimumGraphSize, const QSize &maximu 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 @@ bool ScatterGraph::initialize(const QSize &minimumGraphSize, const QSize &maximu 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 --git a/examples/datavisualization/graphgallery/surfacegraph.cpp b/examples/datavisualization/graphgallery/surfacegraph.cpp index 1ea65e67..88cbc72f 100644 --- a/examples/datavisualization/graphgallery/surfacegraph.cpp +++ b/examples/datavisualization/graphgallery/surfacegraph.cpp @@ -87,7 +87,7 @@ bool SurfaceGraph::initialize(const QSize &minimumGraphSize, const QSize &maximu 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 @@ bool SurfaceGraph::initialize(const QSize &minimumGraphSize, const QSize &maximu 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 @@ bool SurfaceGraph::initialize(const QSize &minimumGraphSize, const QSize &maximu // 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 @@ bool SurfaceGraph::initialize(const QSize &minimumGraphSize, const QSize &maximu 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 --git a/examples/datavisualization/graphgallery/surfacegraphmodifier.cpp b/examples/datavisualization/graphgallery/surfacegraphmodifier.cpp index 527a0d4a..190a96b9 100644 --- a/examples/datavisualization/graphgallery/surfacegraphmodifier.cpp +++ b/examples/datavisualization/graphgallery/surfacegraphmodifier.cpp @@ -152,10 +152,10 @@ void SurfaceGraphModifier::fillSqrtSinProxy() 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 @@ void SurfaceGraphModifier::toggleItemOne(bool show) 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 @@ void SurfaceGraphModifier::toggleItemOne(bool show) 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 @@ void SurfaceGraphModifier::toggleItemTwo(bool show) 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 @@ void SurfaceGraphModifier::toggleItemTwo(bool show) 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 @@ void SurfaceGraphModifier::toggleItemThree(bool show) 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 @@ void SurfaceGraphModifier::toggleItemThree(bool show) 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 --git a/examples/datavisualization/graphgallery/topographicseries.cpp b/examples/datavisualization/graphgallery/topographicseries.cpp index c934f63f..201a275e 100644 --- a/examples/datavisualization/graphgallery/topographicseries.cpp +++ b/examples/datavisualization/graphgallery/topographicseries.cpp @@ -28,12 +28,12 @@ void TopographicSeries::setTopographyFile(const QString file, float width, float 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 --git a/examples/datavisualization/graphgallery/variantbardataproxy.cpp b/examples/datavisualization/graphgallery/variantbardataproxy.cpp index 87ab5f18..8fe73abc 100644 --- a/examples/datavisualization/graphgallery/variantbardataproxy.cpp +++ b/examples/datavisualization/graphgallery/variantbardataproxy.cpp @@ -100,9 +100,9 @@ void VariantBarDataProxy::resolveDataSet() } // 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 --git a/examples/datavisualization/qmlaxishandling/CMakeLists.txt b/examples/datavisualization/qmlaxishandling/CMakeLists.txt index 062e0cb7..41ce410c 100644 --- a/examples/datavisualization/qmlaxishandling/CMakeLists.txt +++ b/examples/datavisualization/qmlaxishandling/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(qmlaxishandling LANGUAGES CXX) diff --git a/examples/datavisualization/qmlaxishandling/customformatter.cpp b/examples/datavisualization/qmlaxishandling/customformatter.cpp index 428ae6ed..b0473159 100644 --- a/examples/datavisualization/qmlaxishandling/customformatter.cpp +++ b/examples/datavisualization/qmlaxishandling/customformatter.cpp @@ -112,7 +112,7 @@ QString CustomFormatter::selectionFormat() const return m_selectionFormat; } -void CustomFormatter::setOriginDate(const QDate &date) +void CustomFormatter::setOriginDate(QDate date) { if (m_originDate != date) { m_originDate = date; diff --git a/examples/datavisualization/qmlaxishandling/customformatter.h b/examples/datavisualization/qmlaxishandling/customformatter.h index 38c9c7d8..2c821b49 100644 --- a/examples/datavisualization/qmlaxishandling/customformatter.h +++ b/examples/datavisualization/qmlaxishandling/customformatter.h @@ -36,11 +36,11 @@ public: QString selectionFormat() const; public Q_SLOTS: - void setOriginDate(const QDate &date); + void setOriginDate(QDate date); void setSelectionFormat(const QString &format); Q_SIGNALS: - void originDateChanged(const QDate &date); + void originDateChanged(QDate date); void selectionFormatChanged(const QString &format); private: diff --git a/examples/datavisualization/qmlbars/CMakeLists.txt b/examples/datavisualization/qmlbars/CMakeLists.txt index 507fab60..2f627b49 100644 --- a/examples/datavisualization/qmlbars/CMakeLists.txt +++ b/examples/datavisualization/qmlbars/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(qmlbars LANGUAGES CXX) diff --git a/examples/datavisualization/qmlscatter/CMakeLists.txt b/examples/datavisualization/qmlscatter/CMakeLists.txt index ef3c349c..381ffd79 100644 --- a/examples/datavisualization/qmlscatter/CMakeLists.txt +++ b/examples/datavisualization/qmlscatter/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(qmlscatter LANGUAGES CXX) diff --git a/examples/datavisualization/qmlsurfacegallery/CMakeLists.txt b/examples/datavisualization/qmlsurfacegallery/CMakeLists.txt index d8a60ce1..ab4dd77d 100644 --- a/examples/datavisualization/qmlsurfacegallery/CMakeLists.txt +++ b/examples/datavisualization/qmlsurfacegallery/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2023 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(qmlsurfacegallery LANGUAGES CXX) diff --git a/examples/datavisualization/volumetric/CMakeLists.txt b/examples/datavisualization/volumetric/CMakeLists.txt index 1fbbb521..fcbf4e0f 100644 --- a/examples/datavisualization/volumetric/CMakeLists.txt +++ b/examples/datavisualization/volumetric/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(volumetric LANGUAGES CXX) diff --git a/licenseRule.json b/licenseRule.json new file mode 100644 index 00000000..2a70539b --- /dev/null +++ b/licenseRule.json @@ -0,0 +1,89 @@ +[ + { + "comment" : ["file_pattern_ending: strings matched against the end of a file name.", + "location keys: regular expression matched against the beginning of", + "the file path (relative to the git submodule root).", + "spdx: list of SPDX-License-Expression's allowed in the matching files.", + "-------------------------------------------------------", + "Files with the following endings are Build System licensed,", + "unless they are examples", + "Files with other endings can also be build system files" + ], + "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", + "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"], + "location" : { + "" : { + "comment" : "Default", + "file type" : "build system", + "spdx" : ["BSD-3-Clause"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedent", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comments" : ["Files with the following endings are Tool licensed,", + "unless they are examples.", + "Files with other endings can also be tool files."], + "file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], + "location" :{ + "" : { + "comment" : "Default", + "file type" : "tools and utils", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedent", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comment" : "Files with the following endings are Documentation licensed.", + "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"], + "location" :{ + "" : { + "comment" : "", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + } + } + }, + { + "comment" : ["All other files", + "The licensing is defined only by the file location in the Qt module repository.", + "NO <file_pattern_ending> key for this case!", + "This needs to be the last entry of the file."], + "location" : { + "" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "src/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "tests/" : { + "comment" : "Default", + "file type" : "test", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Default", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + }, + "tests/auto/cpptest/common/cpptestutil.h" : { + "comment" : "", + "file type" : "util", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + } + } + } +] diff --git a/src/datavisualization/CMakeLists.txt b/src/datavisualization/CMakeLists.txt index 75efa3ce..27f82340 100644 --- a/src/datavisualization/CMakeLists.txt +++ b/src/datavisualization/CMakeLists.txt @@ -80,6 +80,20 @@ qt_internal_add_module(DataVisualization utils/texturehelper.cpp utils/texturehelper_p.h utils/utils.cpp utils/utils_p.h utils/vertexindexer.cpp utils/vertexindexer_p.h + NO_PCH_SOURCES + # undef QT_NO_FOREACH: + engine/abstract3dcontroller.cpp + engine/abstract3drenderer.cpp + engine/axisrendercache.cpp + engine/bars3dcontroller.cpp + engine/bars3drenderer.cpp + engine/q3dscatter.cpp + engine/q3dsurface.cpp + engine/scatter3dcontroller.cpp + engine/scatter3drenderer.cpp + engine/surface3dcontroller.cpp + engine/surface3drenderer.cpp + # end undef QT_NO_FOREACH INCLUDE_DIRECTORIES axis data diff --git a/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp index 5cae4483..2f10a988 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [3] #include <QtDataVisualization> diff --git a/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp index b8369526..5bf508f3 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [3] #include <QtDataVisualization> diff --git a/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp index c2baaf15..3946ede6 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [5] #include <QtDataVisualization> diff --git a/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp b/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp index f0802549..a192976d 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dtheme.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include <QtDataVisualization/Q3DBars> #include <QtDataVisualization/Q3DTheme> diff --git a/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp b/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp index a6e45d48..488d3a6f 100644 --- a/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp +++ b/src/datavisualization/doc/snippets/doc_src_qmldatavisualization.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [0] import QtDataVisualization 1.2 diff --git a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp index 89a34cfe..fa4e5178 100644 --- a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp +++ b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [0] #include <QtDataVisualization> diff --git a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.pro b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.pro index 195567b3..00652a42 100644 --- a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.pro +++ b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.pro @@ -1,5 +1,5 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #! [0] QT += datavisualization diff --git a/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc b/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc index 9857ee90..0bf83ec4 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-overview.qdoc @@ -5,6 +5,7 @@ \title Qt Data Visualization Overview \page qtdatavisualization-overview.html \brief An overview of the Qt Data Visualization module. + \ingroup explanation The Qt Data Visualization module provides a way to develop rapidly responding, complex, and dynamic 3D visualization for analytical demanding diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc index 12fb6650..cb8b70d2 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc @@ -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 --git a/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc index d3375a90..36277944 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-colorgradient.qdoc @@ -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 --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index 68378564..5b91c2da 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -27,7 +27,6 @@ /*! \group datavisualization_examples - \ingroup all-examples \title Qt Data Visualization Examples \brief Examples for the Qt Data Visualization. diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index da5fd645..f7d7f206 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "abstractdeclarativeinterface_p.h" #include "abstract3dcontroller_p.h" #include "qabstract3daxis_p.h" diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index 1fab2bdb..a39a6079 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "abstract3drenderer_p.h" #include "texturehelper_p.h" #include "q3dcamera_p.h" @@ -1636,7 +1638,7 @@ void Abstract3DRenderer::drawCustomItems(RenderingState state, m_drawer->drawObject(shader, item->mesh(), item->texture()); } } - } else if (RenderingSelection == state) { + } else if (RenderingSelection == state && !volumeDetected) { // Selection render shader->setUniformValue(shader->MVP(), MVPMatrix); QVector4D itemColor = indexToSelectionColor(item->index()); diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 401665f9..560e6d2e 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -24,6 +24,8 @@ #include "seriesrendercache_p.h" #include "customrenderitem_p.h" +#include <QtCore/qpointer.h> + QT_FORWARD_DECLARE_CLASS(QOffscreenSurface) QT_BEGIN_NAMESPACE diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp index 6fc80cd6..1218eec2 100644 --- a/src/datavisualization/engine/axisrendercache.cpp +++ b/src/datavisualization/engine/axisrendercache.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "axisrendercache_p.h" #include <QtGui/QFontMetrics> diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index fd6aae65..a307f2f4 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "bars3dcontroller_p.h" #include "bars3drenderer_p.h" #include "qvalue3daxis_p.h" diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 76b616cd..8d2d9cce 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "bars3drenderer_p.h" #include "q3dcamera_p.h" #include "shaderhelper_p.h" diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index 4e5ac2d8..07c86110 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "q3dscatter.h" #include "q3dscatter_p.h" diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index 0c66c32f..2b456814 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "q3dsurface.h" #include "q3dsurface_p.h" diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index 35c678f5..3b7eca01 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -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 @@ QAbstract3DGraph::QAbstract3DGraph(QAbstract3DGraphPrivate *d, const QSurfaceFor 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 --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp index d26eac7c..af7bb204 100644 --- a/src/datavisualization/engine/scatter3dcontroller.cpp +++ b/src/datavisualization/engine/scatter3dcontroller.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "scatter3dcontroller_p.h" #include "scatter3drenderer_p.h" #include "qvalue3daxis_p.h" diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index 16bae194..6a224ebd 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "scatter3drenderer_p.h" #include "q3dcamera_p.h" #include "shaderhelper_p.h" diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp index 03c870c1..13b32666 100644 --- a/src/datavisualization/engine/surface3dcontroller.cpp +++ b/src/datavisualization/engine/surface3dcontroller.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "surface3dcontroller_p.h" #include "surface3drenderer_p.h" #include "qvalue3daxis_p.h" diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 4faeea44..cffed56d 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "surface3drenderer_p.h" #include "q3dcamera_p.h" #include "shaderhelper_p.h" diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index c22a99be..f62aaf70 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -16,7 +16,7 @@ static const int nearZoomRangeDivider = 12; 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 --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp index 39fe9dbc..0b56210b 100644 --- a/src/datavisualization/theme/q3dtheme.cpp +++ b/src/datavisualization/theme/q3dtheme.cpp @@ -309,6 +309,8 @@ QT_BEGIN_NAMESPACE * \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 @@ QT_BEGIN_NAMESPACE * 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 @@ QT_BEGIN_NAMESPACE * \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 @@ QT_BEGIN_NAMESPACE * 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 @@ QT_BEGIN_NAMESPACE * \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 @@ QColor Q3DTheme::labelBackgroundColor() const * \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 --git a/src/datavisualizationqml/CMakeLists.txt b/src/datavisualizationqml/CMakeLists.txt index 0c6ca406..110a5ef0 100644 --- a/src/datavisualizationqml/CMakeLists.txt +++ b/src/datavisualizationqml/CMakeLists.txt @@ -44,6 +44,8 @@ qt_internal_add_qml_module(DataVisualizationQml enumtostringmap.cpp enumtostringmap_p.h foreigntypes_p.h glstatestore.cpp glstatestore_p.h + NO_PCH_SOURCES + declarativetheme.cpp # undef QT_NO_FOREACH QML_FILES ${qml_files} RESOURCES @@ -55,6 +57,7 @@ qt_internal_add_qml_module(DataVisualizationQml Qt::Qml Qt::Quick Qt::DataVisualizationPrivate + NO_GENERATE_CPP_EXPORTS ) qt_internal_extend_target(DataVisualizationQml CONDITION MACOS diff --git a/src/datavisualizationqml/abstractdeclarative.cpp b/src/datavisualizationqml/abstractdeclarative.cpp index 8abfd94c..af19d46f 100644 --- a/src/datavisualizationqml/abstractdeclarative.cpp +++ b/src/datavisualizationqml/abstractdeclarative.cpp @@ -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 @@ void AbstractDeclarative::handleWindowChanged(QQuickWindow *window) 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); @@ -565,7 +565,7 @@ void AbstractDeclarative::render() 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 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window) } 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 --git a/src/datavisualizationqml/declarativetheme.cpp b/src/datavisualizationqml/declarativetheme.cpp index 18dc4f8e..02f3becc 100644 --- a/src/datavisualizationqml/declarativetheme.cpp +++ b/src/datavisualizationqml/declarativetheme.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "declarativetheme_p.h" QT_BEGIN_NAMESPACE diff --git a/sync.profile b/sync.profile deleted file mode 100644 index 5a56ccc6..00000000 --- a/sync.profile +++ /dev/null @@ -1,16 +0,0 @@ -%modules = ( # path to module name map - "QtDataVisualization" => "$basedir/src/datavisualization", - "QtDataVisualizationQml" => "$basedir/src/datavisualizationqml", -); -%moduleheaders = ( # restrict the module headers to those found in relative path -); -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# -%dependencies = ( - "qtbase" => "", - "qtdeclarative" => "", -); diff --git a/tests/auto/qmltest/bars3d/tst_basic.qml b/tests/auto/qmltest/bars3d/tst_basic.qml index e019ef7d..881d629e 100644 --- a/tests/auto/qmltest/bars3d/tst_basic.qml +++ b/tests/auto/qmltest/bars3d/tst_basic.qml @@ -101,8 +101,6 @@ Item { compare(empty.rowAxis.type, AbstractAxis3D.AxisTypeCategory) compare(empty.valueAxis.type, AbstractAxis3D.AxisTypeValue) waitForRendering(top) - empty.destroy() - waitForRendering(top) } } @@ -147,8 +145,6 @@ Item { 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 @@ Item { 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 @@ Item { } 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 @@ Item { 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 @@ Item { 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 --git a/tests/auto/qmltest/scatter3d/tst_basic.qml b/tests/auto/qmltest/scatter3d/tst_basic.qml index 401148c1..7320ac49 100644 --- a/tests/auto/qmltest/scatter3d/tst_basic.qml +++ b/tests/auto/qmltest/scatter3d/tst_basic.qml @@ -86,8 +86,6 @@ Item { compare(empty.axisZ.type, AbstractAxis3D.AxisTypeValue) compare(empty.axisY.type, AbstractAxis3D.AxisTypeValue) waitForRendering(top) - empty.destroy() - waitForRendering(top) } } @@ -100,8 +98,6 @@ Item { compare(basic.width, 150, "width") compare(basic.height, 150, "height") waitForRendering(top) - basic.destroy() - waitForRendering(top) } } @@ -114,12 +110,12 @@ Item { 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 @@ Item { } 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 @@ Item { 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 @@ Item { 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 --git a/tests/auto/qmltest/surface3d/tst_basic.qml b/tests/auto/qmltest/surface3d/tst_basic.qml index 3716cdd6..2979d6d5 100644 --- a/tests/auto/qmltest/surface3d/tst_basic.qml +++ b/tests/auto/qmltest/surface3d/tst_basic.qml @@ -88,8 +88,6 @@ Item { compare(empty.axisZ.type, AbstractAxis3D.AxisTypeValue) compare(empty.axisY.type, AbstractAxis3D.AxisTypeValue) waitForRendering(top) - empty.destroy() - waitForRendering(top) } } @@ -108,8 +106,6 @@ Item { basic.flipHorizontalGrid = false compare(basic.flipHorizontalGrid, false, "flipHorizontalGrid") waitForRendering(top) - basic.destroy() - waitForRendering(top) } } @@ -122,12 +118,12 @@ Item { 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 @@ Item { } 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 @@ Item { 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 @@ Item { 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 --git a/tests/manual/barstest/CMakeLists.txt b/tests/manual/barstest/CMakeLists.txt index 399ae44c..391b98aa 100644 --- a/tests/manual/barstest/CMakeLists.txt +++ b/tests/manual/barstest/CMakeLists.txt @@ -11,6 +11,8 @@ qt_internal_add_manual_test(barstest buttonwrapper.cpp buttonwrapper.h custominputhandler.cpp custominputhandler.h main.cpp + NO_PCH_SOURCES + chart.cpp # undef QT_NO_FOREACH ) target_link_libraries(barstest PUBLIC Qt::Gui diff --git a/tests/manual/barstest/chart.cpp b/tests/manual/barstest/chart.cpp index 6a6291cc..d427921a 100644 --- a/tests/manual/barstest/chart.cpp +++ b/tests/manual/barstest/chart.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "chart.h" #include "custominputhandler.h" #include <QtDataVisualization/qcategory3daxis.h> diff --git a/tests/manual/itemmodeltest/main.cpp b/tests/manual/itemmodeltest/main.cpp index b2fadaea..feebd1b1 100644 --- a/tests/manual/itemmodeltest/main.cpp +++ b/tests/manual/itemmodeltest/main.cpp @@ -208,8 +208,8 @@ void GraphDataGenerator::changeSelectedButtonClicked() { // Change all selected cells to a random value 1-10 QVariant value = QVariant::fromValue(QRandomGenerator::global()->bounded(10.0) + 1); - QList<QTableWidgetItem *> selectedItems = m_tableWidget->selectedItems(); - foreach (QTableWidgetItem *item, selectedItems) { + const QList<QTableWidgetItem *> selectedItems = m_tableWidget->selectedItems(); + for (QTableWidgetItem *item : selectedItems) { QString oldData = item->data(Qt::DisplayRole).toString(); item->setData(Qt::DisplayRole, oldData.left(5) @@ -266,7 +266,7 @@ int main(int argc, char **argv) barProxy->setValueRoleReplace(QStringLiteral("\\4")); barProxy->setRotationRoleReplace(QStringLiteral("\\5")); surfaceProxy->setXPosRole(tableWidget->model()->roleNames().value(Qt::DisplayRole)); - surfaceProxy->setZPosRole(tableWidget->model()->roleNames().value(Qt::DisplayRole)); + surfaceProxy->setYPosRole(tableWidget->model()->roleNames().value(Qt::DisplayRole)); surfaceProxy->setXPosRolePattern(QRegularExpression(QStringLiteral("^(\\d*)\\/(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$"))); surfaceProxy->setXPosRoleReplace(QStringLiteral("\\2")); surfaceProxy->setYPosRolePattern(QRegularExpression(QStringLiteral("^\\d*(\\/)(\\d*)\\/(\\d*[\\.\\,]?\\d*)\\/\\d*[\\.\\,]?\\d*$"))); diff --git a/tests/manual/qmldynamicdata/CMakeLists.txt b/tests/manual/qmldynamicdata/CMakeLists.txt index b692f0ce..739ecd15 100644 --- a/tests/manual/qmldynamicdata/CMakeLists.txt +++ b/tests/manual/qmldynamicdata/CMakeLists.txt @@ -8,6 +8,8 @@ qt_internal_add_manual_test(qmldynamicdata ) target_link_libraries(qmldynamicdata PUBLIC Qt::Gui + Qt::Qml + Qt::Quick Qt::DataVisualization ) diff --git a/tests/manual/qmldynamicdata/qml/qmldynamicdata/main.qml b/tests/manual/qmldynamicdata/qml/qmldynamicdata/main.qml index 30b1087a..1d0e65bf 100644 --- a/tests/manual/qmldynamicdata/qml/qmldynamicdata/main.qml +++ b/tests/manual/qmldynamicdata/qml/qmldynamicdata/main.qml @@ -129,12 +129,12 @@ Item { anchors.fill: parent hoverEnabled: true acceptedButtons: Qt.LeftButton | Qt.RightButton - property int mouseX: -1 - property int mouseY: -1 + property int mouseXPos: -1 + property int mouseYPos: -1 onPositionChanged: (mouse)=> { - mouseX = mouse.x; - mouseY = mouse.y; + mouseXPos = mouse.x; + mouseYPos = mouse.y; } onWheel: (wheel)=> { @@ -161,7 +161,8 @@ Item { running: true repeat: true onTriggered: { - scatterGraph.scene.selectionQueryPosition = Qt.point(inputArea.mouseX, inputArea.mouseY); + scatterGraph.scene.selectionQueryPosition = Qt.point(inputArea.mouseXPos, + inputArea.mouseYPos); } } } diff --git a/tests/manual/qmlgradient/CMakeLists.txt b/tests/manual/qmlgradient/CMakeLists.txt index 8b51f614..8288e1b2 100644 --- a/tests/manual/qmlgradient/CMakeLists.txt +++ b/tests/manual/qmlgradient/CMakeLists.txt @@ -8,6 +8,8 @@ qt_internal_add_manual_test(qmlgradient ) target_link_libraries(qmlgradient PUBLIC Qt::Gui + Qt::Qml + Qt::Quick Qt::DataVisualization ) diff --git a/tests/manual/qmlheightmap/CMakeLists.txt b/tests/manual/qmlheightmap/CMakeLists.txt index 7bb4a2b3..17e7f3f2 100644 --- a/tests/manual/qmlheightmap/CMakeLists.txt +++ b/tests/manual/qmlheightmap/CMakeLists.txt @@ -10,6 +10,8 @@ qt_internal_add_manual_test(qmlheightmap ) target_link_libraries(qmlheightmap PUBLIC Qt::Gui + Qt::Qml + Qt::Quick Qt::DataVisualization ) diff --git a/tests/manual/qmlmultitest/CMakeLists.txt b/tests/manual/qmlmultitest/CMakeLists.txt index 282097f7..a92ff8db 100644 --- a/tests/manual/qmlmultitest/CMakeLists.txt +++ b/tests/manual/qmlmultitest/CMakeLists.txt @@ -8,6 +8,8 @@ qt_internal_add_manual_test(qmlmultitest ) target_link_libraries(qmlmultitest PUBLIC Qt::Gui + Qt::Qml + Qt::Quick Qt::DataVisualization ) diff --git a/tests/manual/qmlperf/CMakeLists.txt b/tests/manual/qmlperf/CMakeLists.txt index baf1102a..31235e32 100644 --- a/tests/manual/qmlperf/CMakeLists.txt +++ b/tests/manual/qmlperf/CMakeLists.txt @@ -11,6 +11,8 @@ qt_internal_add_manual_test(qmlperf ) target_link_libraries(qmlperf PUBLIC Qt::Gui + Qt::Qml + Qt::Quick Qt::DataVisualization ) diff --git a/tests/manual/qmlvolume/CMakeLists.txt b/tests/manual/qmlvolume/CMakeLists.txt index 649f9125..5a0e446a 100644 --- a/tests/manual/qmlvolume/CMakeLists.txt +++ b/tests/manual/qmlvolume/CMakeLists.txt @@ -11,6 +11,8 @@ qt_internal_add_manual_test(qmlvolume ) target_link_libraries(qmlvolume PUBLIC Qt::Gui + Qt::Qml + Qt::Quick Qt::DataVisualization ) diff --git a/tests/manual/scattertest/CMakeLists.txt b/tests/manual/scattertest/CMakeLists.txt index ac131567..89013c12 100644 --- a/tests/manual/scattertest/CMakeLists.txt +++ b/tests/manual/scattertest/CMakeLists.txt @@ -8,6 +8,8 @@ qt_internal_add_manual_test(scattertest SOURCES main.cpp scatterchart.cpp scatterchart.h + NO_PCH_SOURCES + scatterchart.cpp # undef QT_NO_FOREACH ) target_link_libraries(scattertest PUBLIC Qt::Gui diff --git a/tests/manual/scattertest/scatterchart.cpp b/tests/manual/scattertest/scatterchart.cpp index 8a521a2e..fce115d4 100644 --- a/tests/manual/scattertest/scatterchart.cpp +++ b/tests/manual/scattertest/scatterchart.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "scatterchart.h" #include <QtDataVisualization/qscatterdataproxy.h> #include <QtDataVisualization/qscatter3dseries.h> diff --git a/tests/manual/surfacetest/CMakeLists.txt b/tests/manual/surfacetest/CMakeLists.txt index 42e8bf07..bb3f0500 100644 --- a/tests/manual/surfacetest/CMakeLists.txt +++ b/tests/manual/surfacetest/CMakeLists.txt @@ -10,6 +10,8 @@ qt_internal_add_manual_test(surfacetest checkboxwrapper.cpp checkboxwrapper.h graphmodifier.cpp graphmodifier.h main.cpp + NO_PCH_SOURCES + graphmodifier.cpp # undef QT_NO_FOREACH ) target_link_libraries(surfacetest PUBLIC Qt::Gui diff --git a/tests/manual/surfacetest/graphmodifier.cpp b/tests/manual/surfacetest/graphmodifier.cpp index fb0e4e6d..f406513d 100644 --- a/tests/manual/surfacetest/graphmodifier.cpp +++ b/tests/manual/surfacetest/graphmodifier.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses + #include "graphmodifier.h" #include <QtDataVisualization/QValue3DAxis> #include <QtDataVisualization/QSurfaceDataProxy> |