summaryrefslogtreecommitdiff
path: root/config.tests
Commit message (Collapse)AuthorAgeFilesLines
* Use SPDX license identifiersLucie Gérard2022-06-102-83/+3
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: I106d3a5d1a7b96250380b6f51a48f3b19d10e4d9 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 811f060c37a58580e0697d0beb34a6f91efeeb41) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adjust configure tests to ignore libs in /usr/local on macOSJoerg Bornemann2021-10-261-0/+7
| | | | | | | | | | | | On macOS, if pkg-config is not used, we modify CMAKE_SYSTEM_FRAMEWORK_PATH and CMAKE_SYSTEM_PREFIX_PATH to avoid picking up libs from homebrew or macports. This must be done in the configure tests too. Otherwise the find_package commands may return different things for configure tests and the Qt build itself. Task-number: QTBUG-97076 Change-Id: I2077c42fc54736dc9f4a575ecd41297ee8f755b2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Bump almost all cmake_minimum_required calls to 3.16Alexandru Croitor2021-09-221-1/+1
| | | | | | | | | | | | | Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: I43575e48cb4ddb70b80f09e0432a2f88b01bec86 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-04-291-1/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/client/xdgoutput/tst_xdgoutput.cpp Regenerated CMake projects. Removed duplicate wayland source in tests/auto/client/xdgoutput/xdgoutput.pro. It's still referenced via the included shared.pri file. Regenerated the CMake project to adapt to that. Otherwise the CMake project fails to configure due to duplicate rules with a error like the one below CMake Error at src/compositor/Qt6WaylandCompositorMacros.cmake:13 (add_custom_command): Attempt to add a custom rule to output tests/auto/client/xdgoutput/wayland-xdg-output-unstable-v1-server-protocol.h.rule Also use a workaround fix for configuring CMake standalone tests due to regression introduced by dd7e40b1086020f6a054957f4972720cd684 in qtbase. Change-Id: Ib364b851a1fa828c153efbf8653c9e4ef5e618cd
* | Initial CMake portJohan Klokkhammer Helsing2019-11-261-0/+8
|/ | | | | | | | | | | | | | | | The client, compositor, tests, plugins and examples now build. There are still a few minor issues: - The protocol source generation is a bit hacky. - The tests for checking if building CMake projects don't work anymore as they have Qt 5 specific code. They have just been commented out for now. Fixes: QTBUG-78177 Change-Id: Ie17cb05f0cdbd5b098970ce765adaeccf61a8fde Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* Convert most config tests to configure.json inline formatJohan Klokkhammer Helsing2019-09-2020-632/+0
| | | | | | | | | | | | | | And remove the now unused entries in config.tests. Now only the wayland-scanner test remains, as that uses qmake features that do not easily translate to the inline format. This makes it much easier to port QtWayland to cmake. This also removes some config.tests that weren't used. Task-number: QTBUG-78177 Change-Id: Ia21a0025f9fac45b9f4815ee0f196e9e5759cdc6 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Add server buffer integration based on VulkanPaul Olav Tvete2019-03-182-0/+61
| | | | | | | | | | Using NVIDIA's Vulkan/GL interop function: glGetVkProcAddrNV [ChangeLog] Added Vulkan-based server buffer integration for NVIDIA EGLStreams. Change-Id: I500f80ff3b00a9585178976d8e400baa38e89ef6 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Compositor: Implement linux-dmabuf-unstable-v1Andreas Cord-Landwehr2018-12-132-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Compositor] Added support for linux-dmabuf-unstable-v1. Implement client side DMABUF buffer sharing support by supporting the linux-dmabuf-unstable-v1 (version 3) protocol. For enabling DMABUF, set the following environment variables for the compositor: QT_QPA_PLATFORM=eglfs QT_WAYLAND_CLIENT_BUFFER_INTEGRATION=linux-dmabuf-unstable-v1 The current implementation supports the following DRM buffer formats: - RGB and RGBA - YUYV This implementation requires Mesa with the following patch applied. Otherwise, textures are not updated. The patch is contained in Mesa 18.1.5. See https://patchwork.freedesktop.org/patch/238080/ Fixes: QTBUG-66288 Fixes: QTBUG-67845 Change-Id: Id4d90337dbe0be956b0f964426ebed3f281c6c30 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-252-0/+64
|\ | | | | | | Change-Id: I66c91dfde14a7c252a02777cfcf0396b1d05e854
| * Add server buffer integration using Linux dma-bufPaul Olav Tvete2018-09-212-0/+64
| | | | | | | | | | | | Fixes: QTBUG-70494 Change-Id: Iaa4990fe9d39a1f9fb81f5e5f19039aa2e52dcac Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Update libwayland requirement to 1.8.0Johan Klokkhammer Helsing2018-09-181-5/+5
|/ | | | | | | | [ChangeLog] libwayland 1.8.0 is now required. Fixes: QTBUG-70555 Change-Id: Iaf395f0d9262bd0006aacd8f30037c2f095219eb Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Fix outdated BSD license headerKai Koehne2017-10-208-23/+103
| | | | | Change-Id: Ib1ee37ca626afad14b65303a3cfb134485ade736 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Move qtwayland over to use the new configuration systemLars Knoll2016-11-2312-259/+1
| | | | | | | | | | | | | Re-use configuration results from qtbase where possible and move all pkg-config handling over to be done at configuration time. Since waylandclient and waylandcompositor are two independent libs, this required some duplication of features and libraries used by both in the configure.json files. Change-Id: I1f3ec56c85cb780324cc7634a3ad7951125853a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Compile with -no-openglJohan Klokkhammer Helsing2016-07-202-0/+4
| | | | | | | | | | | | | | QtWayland has not compiled without OpenGL for a while. This patch fixes the compilation issues and removes the old config variable, "QT_WAYLAND_GL_CONFIG" and instead checks for the presence of "opengl" in "QT_CONFIG". A new define is also introduced, QT_WAYLAND_COMPOSITOR_QUICK, because it may eventually be possible to use create a QtQuick compositor without OpenGL. Task-number: QTBUG-54322 Change-Id: Ica7b3b320212d4ae1f8b1053725b73c83739c73c Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* Upgrade required Wayland version to 1.6.0Johan Klokkhammer Helsing2016-03-171-5/+5
| | | | | | | | This makes sure QtWayland is only built if a Wayland version >= 1.6.0 is found. Upgraded from 1.4.0. Change-Id: Ibbd965f9e25ae9fd15d9367431574c5c1ff8b7ce Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* Get rid of the egl config test and use what qtbase providesLaszlo Agocs2015-11-112-62/+0
| | | | | | | | | | | | | | | contains(QT_CONFIG, egl) and CONFIG += egl is the only sane way to test for and pull in EGL headers and libs. This is particularly important when trying to be robust and guard against half-broken sysroots on embedded where a naive PKGCONFIG += egl breaks. Also add an EGL_WAYLAND_BUFFER_WL define to keep wayland-egl compiling. We are not testing for that in any config tests may cause a failure in sysroots that have parts of Mesa thrown in but pick ip an older EGL header from the vendor's driver. Change-Id: I7b7e6a7a91e78dbda5b6954ad08761298c538efc Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* RPi: Resolve all BRCM functions dynamicallyLaszlo Agocs2015-11-111-3/+2
| | | | | | | | | | | | Directly calling eglCreateGlobalImageBRCM and friends is not ideal due to the messy RPi distro setups: shipping Mesa (sw rasterizer only) in standard locations may cause picking up those EGL/GLES libs instead of the Broadcom ones from /opt/vc when building Qt. While this is something that should be fixed in the sysroot (since it is a problem at runtime anyway), let's make life easier by resolving via eglGetProcAddress, which is the right approach in any case. Change-Id: I73f7698b638691d97743a6f819bc7c8ee6ebd245 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* Update copyright headersJani Heikkinen2015-02-1712-47/+47
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I5a74d32515c3f1fe7aa1916f4241c92832510f8c Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* Update the protocol to 1.4 and raise the required libwayland versionGiulio Camuffo2015-02-031-5/+5
| | | | | | | | Wayland 1.4 introduces wl_subsurface which is quite an important addition. Change-Id: I48375f60adce556c9989872319f4d073e4a7b13b Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Add a libhybris hardwareintegrations to share EGL server buffersGiulio Camuffo2014-03-262-0/+67
| | | | | | | | | Add a hardwareintegration plugin to make Qt server side EGL buffers shareable from the compositor to the client, such as what the server-buffer example does. Change-Id: I24558324d51202ca449b47b0ee395c8e81c10698 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Change the minimum required Wayland version back to 1.2Giulio Camuffo2014-02-281-5/+5
| | | | | | | | | As discussed, Wayland 1.3 is not common in distributions yet, and that is a problem for the C.I. machines. Change-Id: Iec5c6d8ae1d1a50199f66d45ca9269694db78efe Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Update the required wayland version to 1.3Jorgen Lind2014-01-171-8/+10
| | | | | Change-Id: Id1c9d14061d513f6c37a59ed8161732366ab3526 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Merge remote-tracking branch stable into devAndy Nichols2014-01-095-4/+71
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp src/plugins/platforms/qwayland-brcm-egl/main.cpp src/plugins/platforms/qwayland-egl/main.cpp src/plugins/platforms/qwayland-generic/main.cpp src/plugins/platforms/qwayland-xcomposite-egl/main.cpp src/plugins/platforms/qwayland-xcomposite-glx/main.cpp Change-Id: I957c9bee893a9e19fc8c93f0e51292007fb3a4a8
| * Use xkb, not X11 for symbol defines.Robin Burchell2014-01-081-2/+1
| | | | | | | | | | Change-Id: I6a6acbf83bd13d0a746dc65f560ace3e485ebb38 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
| * Config test for drm_egl_serverJorgen Lind2014-01-062-0/+66
| | | | | | | | | | | | Change-Id: Ib0ae4683374c2fd0c7386863ffb3c207605dc1e2 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| * Only build Walyand EGL QPA if EGL is supported by baseLubomir Rintel2013-11-252-1/+3
| | | | | | | | | | Change-Id: I1e6e39e177d4c173b6eedf2c311bcfe0f9693705 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| * Wayland-EGL QPA: Support desktop OpenGL as wellAndrew Knight2013-11-252-2/+2
| | | | | | | | | | | | | | | | | | There is no hard requirement on OpenGL ES 2 in this plugin, so allow Desktop OpenGL as well. Change-Id: I5b58f21c3640a4403dc6aa710838d4904d85f482 Reviewed-by: Lubomir Rintel <lkundrak@v3.sk> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devAndy Nichols2013-09-091-5/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: qtwayland.pro src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp src/plugins/platforms/wayland_common/qwaylandshellsurface.h src/plugins/platforms/wayland_common/qwaylandwindow.cpp src/plugins/platforms/wayland_common/qwaylandwindow.h Change-Id: Ifa9bc553d826b893b054bbaef5ea3fc3013de3df
| * Update wayland config test to look for at least 1.1Jørgen Lind2013-06-111-5/+8
| | | | | | | | | | Change-Id: I1bfdb3f2ade0f1a640bd0e876130b844e2797137 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Require wayland-cursor to buildSergio Ahumada2013-07-012-0/+60
|/ | | | | Change-Id: Ib09b2cff3f7f57efd25cbd9b085542eab2ac2853 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Made egl and wayland_egl config.tests require GLES2 configured Qt.Samuel Rødal2013-04-232-0/+4
| | | | | | | | | Otherwise the platform native interfaces won't return a valid "EGLDisplay" handle, which is required for all the EGL based integrations to work. Change-Id: I9d5031878da5bf87e1366150f75d000a2f5fc280 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Fixed broken wayland_scanner config.test.Samuel Rødal2013-04-171-2/+10
| | | | | | | | We need to replicate the extra compiler rule to invoke the wayland-scanner without trying to invoke the qtwaylandscanner. Change-Id: I312b24103f63570080c32103fb352f1948308f15 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Set required Wayland version to 1.0.3 or higherAndy Nichols2013-03-021-2/+7
| | | | | | | | We need this version to support the changes made for threaded Wayland event processing. Change-Id: I64babb4e21c3581feb5db843539f85539011c1e6 Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Require xkbcommon and wayland-scanner to buildAndy Nichols2013-02-013-0/+113
| | | | | Change-Id: I83066c632c5dec9599d7261a2f353ef4749a19da Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Cleanup QtWayland moduleAndy Nichols2012-12-032-0/+61
| | | | | | | | | | | | | | | | | | | | | | | Now that both xkbcommon 0.2.0 and libWayland 1.0.0 have been released, we should no longer be building against sha1's and should be preparing for an eventual release so these build hints have been removed. A test has been added for libWayland 1.0.0 which is required to build QtWayland. README has been updated to reflect the current situation src/3rdparty has been removed as it has not been used in some time. patches folder and contents have been removed as they are no longer needed. extensions folder has been moved to the src folder Change-Id: Iab79b5c164758a4bd0253c90f60b2a2d044e2785 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Update QtCompositor API to use wayland 1.0.0Andy Nichols2012-11-041-1/+1
| | | | | Change-Id: I6b598595cdb8ff91d5146e0ae2511752bcfa473f Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-256-36/+36
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie65cbe0c622780d2f0672bce19d267d1167620ff Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Fix libxkbcommon config testLaszlo Agocs2012-07-251-1/+0
| | | | | | | | | Including the qnamespace.h caused a compilation error and so xkbcommon support was disabled all the time. Including that header is not necessary in the first place. Change-Id: I1ff1155d6b10a6cceaaf9117bb3eb74e88fde49d Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix brcm_egl test to not link against QtAndy Nichols2012-07-192-7/+18
| | | | | Change-Id: I734d9f6b1120f5d0d5751069c6b6f551172aca50 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Config tests for gl integrationJorgen Lind2012-07-179-2/+242
| | | | | Change-Id: Ie7d80e7591d11aa5df87ca5d5de4cd6c03928c83 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-272-6/+0
| | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - qmake -project boilerplate - dead code Change-Id: Ia515c3cc40170e3b99b0bfd04c10637d49f9b99f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Introduce standard pkg-config usageDonald Carr2012-06-111-6/+5
| | | | | | | | Use our own qualified pkg-config mkspec feature rather than directly executing the system binary Change-Id: I4b162cd8d2d9a8bd5d0b3adb9ca935df9ff96a69 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Added config.test for brcm_egl.Samuel Rødal2012-05-212-0/+77
| | | | | Change-Id: Ia103645ba0823dc94b42578de1f1e39e7dd84956 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Yet another xkbcommon API changeLaszlo Agocs2012-05-151-2/+2
| | | | | Change-Id: I7ca4bf170cd6adb5b371c3c040ed35387876d0e8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Compile with new xkbcommon APILaszlo Agocs2012-05-091-9/+20
| | | | | Change-Id: Ie3f45a1e624cae3abb71d85c7ea8107b0f6b710c Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Use new xkbcommon includepathPierre Vorhagen2012-03-211-1/+1
| | | | | Change-Id: I294e5e8511ae8319f11d516d452f9b8a0d149b75 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make the module not depend on QtBase configureJørgen Lind2012-03-122-0/+75
This is convenient if we want to reconfigure without reconfiguring QtBase. Change-Id: I719ba0d89905287a557e962ed6d804514e44b7f5 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
View Lorry Controller Status