Commit Graph

23 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
YAMAMOTO Atsushi 06de9a93da Fix memory leak in manual test 'rendercapture-qml'
Deallocate the RenderCaptureReply object returned from requestCapture.

Change-Id: I4fa96a724ad9143dee4a09c51dc8e007ea4e828c
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-10-06 00:05:47 +09:00
YAMAMOTO Atsushi a032acde78 Fix runtime warning in manual test 'rendercapture-qml'
Warning message is:
"QML Button: Detected anchors on an item that is managed by a layout.
 This is undefined behavior; use Layout.alignment instead."
We could replace it with Layout.alignment, but it's not needed here.

Change-Id: I62f4784ca561ff55bb336ddea08fde5e4c685520
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
2022-09-30 11:19:33 +09: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
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 1bf41b83e3 Fix build with latest QtBase and QtDeclarative
Task-number: QTBUG-86410
Change-Id: I26427d65de72c86f952b076259979f90eaef87f4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2020-09-07 14:44:52 +01:00
Paul Lemire 8ef1bab575 Fix connect in rendercapture-qml manual tests
Change-Id: I33afeae789f774d07de157d59c96c9e878f5c0bc
Reviewed-by: Mike Krus <mike.krus@kdab.com>
2020-08-26 16:39:39 +02:00
Paul Lemire 25ac41ad81 Fix compile warnings
Change-Id: I4fbded297c1988b3ace17f6675527a0a00db8973
Reviewed-by: Mike Krus <mike.krus@kdab.com>
2020-08-18 16:36:14 +02: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
Lars Schmertmann eb087fa80f Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6.

Task-number: QTBUG-82978
Change-Id: I2e126d0be8efa0aa89c4a91a681b549f38c8cec4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2020-06-24 19:42:03 +02: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
Mike Krus 22eccf3a95 Use jobsDone to sync render capture back to frontend
Removes the jobs who's only purpose was to send a message to the frontend.
Now added a jobsDone() call to render which is called from main thread
when jobs are completed, so it's safe to sync data to frontend.

Added a task trace for the backend to front end synching.

Change-Id: I587462bea353c5d5a0065b542adcacef4dedb05f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2019-12-13 21:06:38 +00:00
Wieland Hagen 25135da064 RenderBufferCapture test: use good OpenGL profile for multi-sample blitting
Multi-sampling wouldn't work on 2.0 GL

Change-Id: I61168bf70b5d0b74aa3645f413bf5259d2a3b8d6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2017-05-30 05:59:13 +00:00
Andy Maloney c7eea41741 QRenderCapture: add saveImage() to replace saveToFile()
QRenderCapture::saveToFile() does not return success/failure. Returning this
properly means we don't have to verify success somehow. So add a new method
called saveImage() to return the information, and deprecate saveToFile().

Change-Id: I7cf6639d90baa8bce8b90ee795d953a021de7978
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-04-12 19:34:12 +00:00
Kevin Ottens a7942ff726 Clean up QRenderCapture(Reply) API
We don't need the captureId in the public API so deprecate the functions
which make it appear and create overloads with no such id when
appropriate. Only a pointer to a QRenderCaptureReply is needed to
represent a capture request.

Also the "isCompleted" parameter is unneeded on the signal since it is
always true anyway. If we'd want to do error management it would go via
a status flag property or similar.

Change-Id: I9571ece3e3f82f46db5b3993ccf035e770c9d55e
Task-Id: QTBUG-58877
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2017-02-23 12:57:49 +00:00
Paul Lemire 08daecb93d RenderCapture: register with version 2.1
To clearly identify this was added in 5.8 and not part of 5.7

Change-Id: Ifd713efa34f0092c250eae58260fab71865bb49e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2016-12-07 13:22:24 +00:00
Antti Määttä 1d6b264abd Update rendercapture-qml example
Add checkbox to toggle multisampling to test that multisampled
framebuffers work with rendercapture.

Change-Id: I40e15bca457c47cf4cbd9be6667819c69f4e8b15
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2016-10-20 08:20:30 +00:00
Antti Määttä e949c8c22e Add rendercapture-qml example
Add new example to test the RenderCapture functionality in QML. The test
is based on simple-qml example.

Change-Id: Ie6aeaffd9ebe1faa0fb120e7f4d440618a3f79d3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2016-10-20 05:54:13 +00:00