Commit Graph

2002 Commits

Author SHA1 Message Date
Joerg Bornemann 42c0c27769 Fix manual tests for the top-level build
Don't set CMAKE_AUTO* to ON, because in a top-level build AUTOMOC would
complain about a missing moc executable.  Same for uic and rcc.

Change-Id: Iaa7c8013f11cebb3dc02f2de681c608ee5ba01e0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-08-03 08:02:12 +02:00
Alexandru Croitor 03c93b489b CMake: Don't use PUBLIC_LIBRARIES for tests and test helpers
Change-Id: Ie8bd35a3aa6a56bfe4b3290b9c507a3ed9e61608
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-07-28 14:57:37 +02:00
Qt Submodule Update Bot d2a85bf897 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I33620ac11889ef384bb447b8dc064ac476f91bf2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-28 08:40:49 +00:00
Kai Köhne f75554d082 Doc: Specify module header
Fixes

  (qdoc) Could not find the module header in include paths for module "QtDataVis3D"

Pick-to: 6.4
Change-Id: I6d79454dbacc06805cea986b5f0739febed6a085
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
2022-07-22 11:09:32 +02:00
Qt Submodule Update Bot 094d340efb Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I196e9f375068b08bc59bb9466ba8331236a99022
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-19 18:03:23 +00:00
Qt Submodule Update Bot 8f9e3eb656 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Id7c6011f5d75bc96067f5071fcc937aca82ccf8a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-15 15:18:24 +00:00
Qt Submodule Update Bot 772b7b9639 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Ic0429e8c782c829bb86948379b7a255696e24164
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-13 10:04:54 +00:00
Marc Mutz 24106d1e1c Fix layering violation involving AbstractDeclarative
When trying an ubsan build of qtdatavis3d, I get:

   abstract3dcontroller.cpp.o: undefined reference to `typeinfo for AbstractDeclarative'

Turns out that AbstractDeclarative is defined in DataVisualizationQml,
a separate library, which depends on DataVisualization.

It seems this worked because Abstract3DController only used inline
members of AbstractDeclarative, so a normal build doesn't need the
class exported, even though it's curious that inline isReady() calls
exported QQuickItem::isComponentLoaded() and the linker didn't
complain.

But an UBSan build requires the type_info, which isn't available,
because the class wasn't exported, and cannot be made available
because of the layering violation.

To fix, Extract Superclass AbstractDeclarativeInterface that provides
only the required isReady() function, but lives in DataVisualization,
and have the real AbstractDeclarative inherit it.

As a drive-by, make isReady() const.

Pick-to: 6.4 6.3 6.2
Fixes: QTBUG-104714
Change-Id: I0eb718746355f409a4105e2d53e79b7003fd8b22
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
2022-07-06 13:20:10 +00:00
Qt Submodule Update Bot a9bf8ce4d0 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I3adc41c3e506f7cead3e52f7696bc39bddc4792d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-24 14:30:33 +00:00
Alexandru Croitor 23c87e42c8 coin: Prepare for using qt-configure-module in instructions
When using qt-configure-module, we need to check if widgets feature
is disabled with configure-style syntax as well.

Pick-to: 6.2 6.3 6.4
Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I44147123a4c36ab6b8dfebb2affdc8c4bcde7149
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-06-24 11:59:24 +02:00
Marc Mutz 05b90ceb50 Fix -Wunused-function on non-OSX platforms
Found by headerscheck.

Pick-to: 6.4 6.3 6.2
Change-Id: If3c7e2a10132a1201a08db1fb9b71d0cdcd395ff
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
2022-06-21 14:25:32 +02:00
Qt Submodule Update Bot 26d23043b7 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I00d91149bb39256a486c162178f84394eb4ee056
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-21 05:19:58 +00:00
Qt Submodule Update Bot 97ce50185f Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Ie3c7b46ca582d543aa9b55a5a3faa8497710d65d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-13 16:00:42 +00:00
Jani Heikkinen 4ddfc6a233 Bump version to 6.5.0
Change-Id: I1b6ad924e84448771df9046707b40ca80d5361c4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-13 19:00:41 +03:00
Lucie Gérard 7d498a8cf5 Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I3b3112f5a36673b90fff0010f973d020886cf08d
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-06-13 15:58:51 +02:00
Sami Varanka bc2e34b01b Fix manual test compilation errors
Many of the manual tests were not compiling,
because many of the signals and slots had not
compatible signatures.

Pick-to: 6.4 6.3 6.2
Change-Id: Ibd881e5cca37ec666cb160c95b948e064ac09e5d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2022-06-07 14:40:09 +03:00
Qt Submodule Update Bot 5c89a28a91 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I064fff7deaa0239a93d40feeb886df5f17b7fc6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-31 18:32:41 +00:00
Qt Submodule Update Bot f47d538e4c Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I0104892c69f807a269d1943dc07f5bb85b3ceb95
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-27 13:50:46 +00:00
Qt Submodule Update Bot b52f3b1b7f Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: If5611e0e7733bdbc41582a5d0b98c6dfaace2623
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-24 05:36:26 +00:00
Assam Boudjelthia efdb022abc Make sure qml test data is packaged as test resources
This will make sure the test data is packaged and available
on device at runtime.

Task-number: QTBUG-88846
Pick-to: 6.2 6.3
Change-Id: I9a62299243a784b5e3857ddd968a2abcdd3d6d54
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2022-05-19 07:23:09 +00:00
Qt Submodule Update Bot ff85934152 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Idfc2a5330d53bd437be4bb096bd985c5c34f9781
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-18 00:08:44 +00:00
Qt Submodule Update Bot 3f6659726b Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I39cd185af15c04b1f2295e57222ed901f15f77c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-16 06:10:52 +00:00
Qt Submodule Update Bot 6f24d7e0ed Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I2a03e81d9e0e8654444678b45033a6de3ffe9845
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-12 13:45:59 +00:00
Qt Submodule Update Bot acff8f083b Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Ic2af62e84947d8285f67da19cd79a53152fc6b45
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-11 15:57:32 +00:00
Qt Submodule Update Bot 487eaffb8d Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Ia5b5aee3ba0e46a5c2a25385ee2422caac4716a6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-09 07:56:41 +00:00
Qt Submodule Update Bot 990055f554 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I51004cb2cb620476227623f8089ad393cd0176a6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-05 05:08:00 +00:00
Qt Submodule Update Bot c455cbb8dc Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I1536bd3e9fa8efb5b7c6d46cad10de19babeed4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-28 05:31:08 +00:00
Qt Submodule Update Bot ae9f45d15a Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I627199fae4e7e6162ce8e2e52b132b42a4fb1be6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-26 11:34:20 +00:00
Tomi Korpipaa 069eb42d7f Rename the test to match the expected filename
...and pass argv+argc to qExec.

Task-number: QTBUG-102735
Change-Id: If2ef09f39d13c29f73b9b199e50b72b0e91ffe75
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-04-26 11:33:41 +00:00
Thiago Macieira 571d124904 Scatter3DRenderer: initialize variable to make GCC 12 happy
The compiler thinks the variable could be used uninitialized. It
can't...

scatter3drenderer.cpp:385:49: error: ‘oldVisibility’ may be used uninitialized [-Werror=maybe-uninitialized]

Change-Id: If05aeeb7176e4f13af9afffd16e85d357c2288ab
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2022-04-25 08:12:44 -07:00
Tomi Korpipaa 23e093c7bb Fix a qt-testrunner.py QEMU failure
Fixes: QTBUG-102735
Change-Id: I7e4941ffe6bec251957e6d3fe96e69cc797625b3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-04-25 13:07:03 +03:00
Tomi Korpipaa ae915cba96 Clarify the usage of SelectionMultiSeries flag
Pick-to: 6.3
Fixes: QTBUG-102405
Change-Id: I8ebc07858b0c60f3ba469f8d0e5d978d0ca3654f
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-04-08 11:26:22 +03:00
Alexandru Croitor 1a9b00c205 Remove clash with QmlModels QAbstractItemModel foreign type
Both define a struct called QAbstractItemModelForeign.

This led to a linking duplicate symbol issue with static Qt libraries:

 duplicate symbol 'QAbstractItemModelForeign::staticMetaObject' in:
   libQt6DataVisualizationQml_debug.a(mocs_compilation.cpp.o)
   lib/libQt6QmlModels_debug.a(mocs_compilation.cpp.o)

Add a DataVis infix to the foreign types created by the module, so
they don't clash with the QmlModels ones.

Amends 8691caff2b

QmlModels type was added in 528547f5d9d6929f41c94e11591dae36f2794ba2

Pick-to: 6.3
Task-number: QTBUG-102256
Change-Id: I0134ffb7da9e97ff347991a144b5297643aa4c0c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
2022-04-05 10:48:08 +02:00
Qt Submodule Update Bot 7a4b39cc28 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Id1d2431f1996774df71590b27292fa8b2d570a2e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-01 18:58:42 +00:00
Pasi Petäjäjärvi 4e6deeeec0 Revert "Blacklist: test cases blacklisted in qmltest:"
This reverts commit 0b493d875d.

Reason for revert: Fixed in aec6b0075863bff181d1d3dfdf1399264de01f67

Task-number: QTBUG-101513
Change-Id: Ibf9e867bb787014d60dee1461b9c167bd158c360
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-04-01 08:00:48 +00:00
Qt Submodule Update Bot 5c368d6a67 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I2059d82ef572793f4b9782235c39e8972b1bc914
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-31 16:58:41 +00:00
Tomi Korpipaa 8cdc2cc859 Fix errors caused by dependency update
Fixes: QTBUG-102139
Change-Id: Id9bc508f714a51915fd4d8f67e36561942e19c74
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-03-31 07:32:24 +03:00
Qt Submodule Update Bot ba061d0725 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I425efc1f0fbeca5e3de5257a30aded093da7a427
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-31 04:32:19 +00:00
Kai Köhne 40b4d53658 Show CMake, qmake information in C++ class documentation
Pick-to: 5.15 6.2 6.3
Change-Id: I3f7c7150b9a3409fa17a7009b2e69142d17548bc
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2022-03-23 13:10:49 +01:00
Qt Submodule Update Bot 12082c5647 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: I8246ba1feb5ab1055a93106b7936ba4e985c637c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-21 06:13:02 +00:00
Pasi Petäjäjärvi dc7372156b CI: Disable tst_qmltest on QNX QEMU
QNX QEMU does not have support for hw acceleration thus missing
createPlatformOpenGLContext, which is required for the QML applications
to work.

Pick-to: 6.2 6.3
Change-Id: Ic24f96e9cdc907ae16c1a50b0f0ddf75085d807e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2022-03-14 10:57:28 +02:00
Fabian Kosmale f9d5575476 datavis3d: do not rely on transitive includes
Change-Id: I837af484ee94b4a55bd4f6a404ea5b98b800d093
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-11 10:09:50 +01:00
Thiago Macieira bf27841228 Make sure all private headers include at least one other
See script in qtbase/util/includeprivate for the rules.

Since these files are being touched anyway, I also ran the
updatecopyright.pl script too.

Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2022-03-08 08:04:52 -08:00
Qt Submodule Update Bot 330a05d337 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Ie933920a9b9e4c56bb71739bb92a6019508f41c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-08 05:25:42 +00:00
CI Insignificant Platforms Monitor Bot 0b493d875d Blacklist: test cases blacklisted in qmltest:
- tst_customvolume::compile on qnx
 - tst_touch::compile on qnx
 - tst_themecolor::compile on qnx
 - tst_colorgradient::compile on qnx
 - tst_proxy::compile on qnx
 - tst_heightproxy::compile on qnx
 - tst_customitem::compile on qnx
 - tst_scatterseries::compile on qnx
 - tst_surfaceseries::compile on qnx
 - tst_light::compile on qnx
 - tst_surface::compile on qnx
 - tst_value::compile on qnx
 - tst_customlabel::compile on qnx
 - tst_camera::compile on qnx
 - tst_barseries::compile on qnx
 - tst_category::compile on qnx
 - tst_basic::compile on qnx
 - tst_scene::compile on qnx
 - tst_bars::compile on qnx
 - tst_logvalue::compile on qnx
 - tst_theme::compile on qnx
 - tst_scatter::compile on qnx
 - tst_input::compile on qnx

Pick-to: 6.2
Pick-to: 6.3
Task-number: QTBUG-101513
Change-Id: Ia08731ec898d02ad2196a3d21364850d9ac2dc49
Reviewed-by: CI Insignificant Platforms Monitor Bot <ci_insignificant_platforms_monitor_bot@qt.io>
2022-03-07 16:26:38 +00:00
Qt Submodule Update Bot 492081b160 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Ib679bcdf77004e29548d0c9dacfecf31a672a8b4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-05 03:22:43 +00:00
Alexandru Croitor 77a26e0c0a CMake: Record package dependency on DataVisualizationPrivate
The build system only records dependencies on module packages when
they start with the Qt:: prefix.

Do that for DataVisualizationPrivate.

This fixes the warning / error:

 Found package configuration file:
  Qt6DataVisualizationQml/Qt6DataVisualizationQmlConfig.cmake
  but it set Qt6DataVisualizationQml_FOUND to FALSE so package
  "Qt6DataVisualizationQml" is considered to be NOT FOUND.  Reason
  given by package:

  The following imported targets are referenced, but are missing:
  Qt6::DataVisualizationPrivate

Amends 8691caff2b

Pick-to: 6.3
Fixes: QTBUG-99724
Change-Id: I92a280121a0584bc1718237e8965a2b5dd0ba774
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-03-03 16:43:00 +01:00
Andreas Eliasson d7c379e970 Doc: Revise Qt Datavis module landing page
This module landing page follows the style and structure from the Qt
CoAP module landing page.

Task-number: QTBUG-100369
Pick-to: 6.3
Change-Id: I7062888d0c5a13392c0e2b6f2970677b8a9269d0
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2022-03-03 10:43:01 +01:00
Qt Submodule Update Bot 006411f376 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Ifbbf92df564212dba346200e1dd2812168db3922
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-01 00:29:29 +00:00
Qt Submodule Update Bot afb95ea1f3 Update dependencies on 'dev' in qt/qtdatavis3d
Change-Id: Ib954bf43c357c10e313287675d7325dd3ea7d69c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-25 08:36:54 +00:00