Commit Graph

20 Commits

Author SHA1 Message Date
Lucie Gérard 28bba0ad93 Correct license for test files
According to QUIP-18 [1], all test files should be
LicenseRef-Qt-Commercial OR GPL-3.0-only

[1]: https://contribute.qt-project.org/quips/18

Pick-to: 6.7
Task-number: QTBUG-121787
Change-Id: I966d4033a73aacabb39f582270f2f1c18e2bcecd
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2024-04-23 06:28:57 +00:00
Mike Krus c9bd3ad794 Remove qmake build files
Except in examples

Pick-to: 6.5
Change-Id: I31b06ddfc79f14dde3369518a76d57606daf939f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2023-03-17 17:47:51 +00:00
Lucie Gérard 8f339ea3d0 Change the license of all CMakeLists.txt and *.cmake files to BSD
Task-number: QTBUG-105718
Change-Id: I97fa27f60a8546ea3d73cc7daf1b728c615a1ab0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-08-24 01:53:10 +02:00
Alexandru Croitor 4ddbab6f63 CMake: Don't use PUBLIC_LIBRARIES for tests and test helpers
Change-Id: I393161c3adef90f776572c41d03305d2aa3979f8
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-07-27 13:48:03 +02:00
Lucie Gérard 0802d82e08 Add license headers to cmake files
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.

Existing copyright statements remain intact

Task-number: QTBUG-88621
Change-Id: I141f5077ae0c11e1058de64d573ca33e2a308ccd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-07-08 13:42:44 +02:00
Lucie Gérard 2f1bc82b35 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: I8105424281eed871037fa6c463871ca8829876b5
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-06-22 10:47:10 +02:00
Kai Köhne cd9de7b9b5 Replace QT_BEGIN_LICENSE:LGPL3 header
Replace outdated LGPL3 with LGPL header in src, and
GPL3-EXCEPT in tests.

Task-number: QTBUG-90321
Pick-to: 6.2
Change-Id: I3f6491cb402a993a4341a983c780337e8658c256
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-08-10 06:57:24 +00:00
Mike Krus bcad723d9c Use internal CMake API
Task-number: QTBUG-86815
Change-Id: I7a8755571c8977be1f16b2287e5a8055e9016ee5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-10-07 16:00:04 +01:00
Mike Krus 174cd487b4 Make sample meshes geometry renderers again
Introduce new geometry view class for each.

Change-Id: I8e9a8f3a078d4cc63f9656ae8142e39f05d755c7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2020-07-30 13:51:37 +01:00
Mike Krus 22dd309499 Add support for building with CMake
Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29
Reviewed-by: Mike Krus <mike.krus@kdab.com>
2020-05-22 08:53:50 +01:00
Mike Krus 5bf4f93fcb Make default geometries views
In Extras, make QTorusMesh and others a QGeometryView rather than
a QGeometryRenderer. Requires changes to scene graphs here and there
but going forward there simple shapes could be used as proxies for
picking or collision detection, etc.

Change-Id: Id488e064080dfd303e448aba11e6b242236b81d4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2020-02-27 12:10:08 +00:00
Määttä Antti 603663b74a Change manual tests using Scene2D to use TextureMaterial
Change render-qml-to-texture-qml and video-texture to use TextureMaterial.
This removes the dependency to the render-qml-to-texture manual test from
these tests. This also fixes the controls in the render-qml-to-texture-qml
test, which were 'upside down'.

Change-Id: I248014decd8f9d06b0e0922d035afe8c0b0f78ff
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-06-24 12:59:19 +00:00
Antti Määttä 337bc59bb3 Scene2D cleanup - register pick events when scene is initialized
The current model where mouseGrab is connected to picker signal
doesn't work. The pressed event is not sent to scene2d item, because it is
already lost when scene2d gets the grabMouse message where it registers to
the picker events. This breaks the mouse event sequence
(press-move-release) for the quick item.

Instead hook to setScene of the node to message scene2d when the scene gets
initialized and always register to the picker events.

Task-number: QTBUG-58876
Change-Id: Ic9ca4b0899a030336ef20ff2cffbe10b567c36f5
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
2017-05-09 08:59:31 +00:00
Antti Määttä fddaeae702 cleanup scene2d - change mouse event handling
Task-number: QTBUG-58876
Change-Id: I103125ff15a4b28a67832eb7b86b1abbd2f3fde8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-03-03 18:50:46 +00:00
Antti Määttä 154c3a9b44 Move scene2d to own module and implement conditional plugin loading
- Add quick3dscene2d module
- Add importsscene2d qml module
- Modify RenderAspect to load plugins conditionally
- change autotests to match the module change

Change-Id: If6596472acbd9a377561b2bfd2094a0585c781ac
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
2017-02-28 09:48:17 +00:00
Kevin Ottens 5b17f3ef63 Fix QML version registration for 5.9 types
Put a couple of the types which ended up wrongly at 2.0 with the other
ones. Also applies the decision to go from 2.1 straight to 2.9 to
realign the minor version with the Qt one. Will make it easier to
manage.

Change-Id: I7088b6c493296924a1d313c83107d5755e548ede
Task-Id: QTBUG-58890
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2017-02-23 07:04:13 +00:00
Antti Määttä 0888e3db4d Change renderOnce to RenderPolicy enum
Change-Id: Ie37085ec884034c0f080c782ec44505f046c50bd
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-01-27 13:57:06 +00:00
Antti Määttä 09364817fa Enable mouse events for the render-qml-to-texture-qml test
This makes the rendered Quick controls interactive.

Change-Id: I887ca9dd779c8333491e04430717e9b86ba74eda
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-01-26 16:00:04 +00:00
Antti Määttä 57a25953d4 Update render-qml-to-texture test
Use inline qml

Change-Id: I3a4ceb82a9e8d4478bdbb71ca400bb81ab6ccad2
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-01-26 12:08:09 +00:00
Antti Määttä 5fb7611e5f Render QML to texture examples
Adds tests for the RenderQmlToTexture.

Task-number: QTBUG-51656
Change-Id: Ice18b308b85bc522ac5cdb37894d360438b8b3ac
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-01-26 12:08:02 +00:00