Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-wayland for openSUSE:Factory checked in at 2023-05-28 19:22:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-wayland (Old) and /work/SRC/openSUSE:Factory/.qt6-wayland.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-wayland" Sun May 28 19:22:17 2023 rev:23 rq:1089112 version:6.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-wayland/qt6-wayland.changes 2023-04-05 21:37:16.611123851 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-wayland.new.1533/qt6-wayland.changes 2023-05-28 19:22:45.340931066 +0200 @@ -1,0 +2,6 @@ +Wed May 24 07:45:46 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 6.5.1 + * https://www.qt.io/blog/qt-6.5.1-released + +------------------------------------------------------------------- Old: ---- qtwayland-everywhere-src-6.5.0.tar.xz New: ---- qtwayland-everywhere-src-6.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-wayland.spec ++++++ --- /var/tmp/diff_new_pack.QF7zOP/_old 2023-05-28 19:22:45.788933732 +0200 +++ /var/tmp/diff_new_pack.QF7zOP/_new 2023-05-28 19:22:45.792933755 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.5.0 +%define real_version 6.5.1 %define short_version 6.5 %define tar_name qtwayland-everywhere-src %define tar_suffix %{nil} @@ -30,7 +30,7 @@ %global with_opengl 1 %endif Name: qt6-wayland%{?pkg_suffix} -Version: 6.5.0 +Version: 6.5.1 Release: 0 Summary: Qt 6 Wayland libraries and tools # The wayland compositor files are GPL-3.0-or-later ++++++ qtwayland-everywhere-src-6.5.0.tar.xz -> qtwayland-everywhere-src-6.5.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/.QT-ENTERPRISE-LICENSE-AGREEMENT new/qtwayland-everywhere-src-6.5.1/.QT-ENTERPRISE-LICENSE-AGREEMENT --- old/qtwayland-everywhere-src-6.5.0/.QT-ENTERPRISE-LICENSE-AGREEMENT 2023-03-29 08:45:08.681524500 +0200 +++ new/qtwayland-everywhere-src-6.5.1/.QT-ENTERPRISE-LICENSE-AGREEMENT 2023-05-22 09:05:59.336949600 +0200 @@ -1253,7 +1253,7 @@ +----------------------------------------------------------+ | Device Utilities | | | X,R | X,R | +----------------------------------------------------------+ -| Qt Debugging Bridge (QBD) Daemon | | | X,R | X,R | +| Qt Debugging Bridge (QDB) Daemon | | | X,R | X,R | +----------------------------------------------------------+ | Qt Quick Ultralite Controls | | | X,R | X,R | +----------------------------------------------------------+ @@ -1669,116 +1669,152 @@ APPENDIX 8: INTENTIONALLY LEFT BLANK APPENDIX 9: SUPPORT TERMS +Version 2023-04 -These Qt support terms and conditions ("Support Terms") set forth the legal -framework, where under The Qt Company ("The Qt Company") provides support +These Qt support terms and conditions (âSupport Termsâ) set forth the legal +framework, where under The Qt Company (âThe Qt Companyâ) provides support services (as herein defined) to the Licensee. 1 DEFINITIONS -"Application Code" shall mean a computer software program written strictly +âApplication Codeâ shall mean a computer software program written strictly using the Qt programming language, by or for the Licensee, with a user interface, enabling the Licensee or their users to accomplish a specific task and display any results of the task on the display monitor or screen. -"Dedicated Contact" shall mean the employee of The Qt Company who will be the -first point of contact for all Designated Users' requests for Support. +âCustomer Portalâ shall mean The Qt Companyâs web-based service and support +user interface located at https://account.qt.io/ or at another location +designated by The Qt Company. Customer Portal is used by a Designated User with +Qt Account, and it provides downloads, license management, license certificate +and other services for Designated Users. -"Errors" shall mean an error, flaw, mistake, failure, or fault in Licensed +âDedicated Contactâ shall mean the employee of The Qt Company who will be the +first point of contact for all Designated Usersâ requests for Support. + +âErrorsâ shall mean an error, flaw, mistake, failure, or fault in Licensed Software that prevents it from behaving as described in the relevant -documentation or as agreed between the Parties. +documentation or as agreed between the Parties. Designated User can follow the +state and progress of Errors in Customer Portal. -"Extended Support" shall mean a continuation to the normal Support period, +âExtended Supportâ shall mean a continuation to the normal Support period, which allows Designated Users to receive selected Support (Standard Support or Premium Support) for a version of Licensed Software that is no longer generally supported by The Qt Company. -"Install Support" shall mean Support that is limited to installation related +âInstall Supportâ shall mean Support that is limited to installation-related Error(s) on Development Platforms specified as supported host platforms for -each Qt release under doc.qt.io. +each Qt release under doc.qt.io. Install Support covers also operational use of +the QA Tools, but not operational use of Qt Software. -"Maintenance Release" shall mean a release or version of Licensed Software +âMaintenance Releaseâ shall mean a release or version of Licensed Software containing bug fixes, error corrections and other changes targeted to maintaining and improving product stability and quality. Maintenance Releases are generally depicted as a change to the third digit of Licensed Software version number. -"Platforms" shall mean both Development Platforms and Deployment Platforms. +âPlatformsâ shall mean both Development Platforms and Deployment Platforms. Supported host and target Platforms may vary from for each Qt release as defined under doc.qt.io. -"Premium Support" shall mean an upgraded level of Support that The Qt Company +âPremium Supportâ shall mean an upgraded level of Support that The Qt Company provides pursuant to these Support Terms to Licensee if Licensee has purchased -Premium Support instead of Standard Support. Premium Support shall always be -purchased for all Designated User(s) in the respective development team of the -Licensee. +Premium Support instead of Standard Support. Premium Support also covers what +is included in Standard Support. Premium Support shall always be purchased for +all Designated User(s) in the respective development team of the Licensee. + +âQt Accountâ shall mean the Qt Account for a Designated User used for using Qt +services and Customer Portal. A Qt Account is mapped to the Licensee company +with the corporate email domain or domains. + +âQualification Kitâ shall mean a set of documents and validation test cases +used for product certification needs as defined in section 2.6. -"Response Time" shall mean the period of time from when Licensee notifies -TheQt Company about an Error or requests Support until The Qt Company provides +âResponse Timeâ shall mean the period of time from when Licensee notifies The +Qt Company about an Error or requests Support until The Qt Company provides Licensee with a response that addresses (but not necessarily resolves) the reported Error or provides the requested Support. -"Standard Support" shall mean standard level of Support that The Qt Company -provides pursuant to these Support Terms to Licensee. +âStandard Supportâ shall mean standard level of Support that The Qt Company +provides pursuant to these Support Terms to Licensee. Standard Support also +covers what is included in Install Support. + +âSecurity Issueâ shall mean an Error that may cause a vulnerability in a system +or application that uses the Licensed Software. + +âSupportâ shall mean developer assistance that is provided by The Qt Company to +assist eligible Designated Users in Licensed Software installation, usage and +functionality problem resolution for Error(s) and Error workarounds pursuant to +the terms of these Support Terms. Support for different products is available +as specified in the below table (âXâ marking the Support that is included in +the license price, optional Add-on Support services are marked as âOâ): -"Support" shall mean developer assistance that is provided by The Qt Company -to assist eligible Designated Users in Licensed Software installation, usage -and functionality problem resolution for Error(s) and Error workarounds -pursuant to the terms of these Support Terms. Support for different products is -available as specified in the below table ("X" marking the Support that is -included in the license price, optional Add-on Support services are marked as -"O"): - -+-----------------------------------------------------------------------+ -| |ADP|ADE|DCP|DCE|DSP|DSE|Squish|Coco|Test Center| -+-----------------------------------------------------------------------+ -| Install Support | X | X | X | X | X | X | X | X | X | -+-----------------------------------------------------------------------+ -| Standard Support | | X | X | X | X | X | X | X | X | -+-----------------------------------------------------------------------+ -| Premium Support | | O | O | O | O | O | O | O | O | -+-----------------------------------------------------------------------+ -| Extended Support | | O | O | O | O | O | | | | -+-----------------------------------------------------------------------+ -| Tool Qualification Kit| | | | | | | O | O | | -+-----------------------------------------------------------------------+ ++-----------------------------------------------------------------------------+ +| | Install| Standard| Premium| Extended| Qualification| +| | Support| Support | Support| Support | Kit | ++-----------------------------------------------------------------------------+ +| DSP | X | X | O | O | | ++-----------------------------------------------------------------------------+ +| DSE | X | X | O | O | | ++-----------------------------------------------------------------------------+ +| ADP | X | | | | | ++-----------------------------------------------------------------------------+ +| ADE | X | X | O | O | | ++-----------------------------------------------------------------------------+ +| DCP | X | X | O | O | | ++-----------------------------------------------------------------------------+ +| DCE | X | X | O | O | | ++-----------------------------------------------------------------------------+ +| Squish | X | X | O | | O | ++-----------------------------------------------------------------------------+ +| Coco | X | X | O | | O | ++-----------------------------------------------------------------------------+ +| Test Center | X | X | O | | O | ++-----------------------------------------------------------------------------+ +| Axivion Suite | X | X | | | | ++-----------------------------------------------------------------------------+ +| Architecture Analysis | X | X | | | | ++-----------------------------------------------------------------------------+ +| Static Code Analysis | X | X | | | | ++-----------------------------------------------------------------------------+ +| Static Coverage | X | X | | | | +| Analysis Professional | | | | | | ++-----------------------------------------------------------------------------+ +| Qt Insight | | X | | | | ++-----------------------------------------------------------------------------+ -"Support Validity Term" shall mean the Development License Term or any other -fixed time period agreed between the Parties during which time the Customer is +âSupport Validity Termâ shall mean the Development License Term or any other +fixed time period agreed between the Parties during which time the Licensee is eligible to receive Support from The Qt Company. -"Tool Qualification Kit" shall mean a customized set of documents and -validation test cases. - 2 SUPPORT SERVICES 2.1 Support Services Provided by The Qt Company Subject to these Support Terms and during the Support Validity Term, The Qt -Company will via its web-based support user-interface, provide Designated -User(s) with Support for the Platforms which Customer has licensed under the -Agreement. -The Qt Company will make commercially reasonable efforts to solve any Errors -reported by Designated User(s). Resolution of an Error may be provided through +Company will via its Customer Portal, provide Designated User(s) with Support +for the Licensed Software which Licensee has licensed under the Agreement. The +Qt Company will make commercially reasonable efforts to solve any Errors +reported by Designated User(s). Resolution of an Error may be provided through Designated User(s) themselves downloading of a later released version of the applicable Licensed Software product(s) or providing the Designated User with a -temporary workaround addressing such Error. +workaround addressing such Error or providing the Designated User with an +updated tool configuration. 2.2 Licensee's Obligations -To report an Error, the Designated User shall register the Error on The Qt -Company's web-based support user interface located at: -https://account.qt.io/login or at another location designated by The Qt Company. +To report an Error, the Designated User shall register the Error on the +Customer Portal. If the Designated User considers the reported Error to be a +Security Issue, the Error shall be marked as a Security Issue. The Designated User must provide adequate information and documentation to The Qt Company to enable it to recreate the Error or problem for which the -Designated User has sought assistance. -To ensure efficient handling of Errors, the Designated User must provide the -following information, where relevant: +Designated User has sought assistance. To ensure efficient handling of Errors, +the Designated User must provide the following information, where relevant: - A clear, detailed description of the problem, question or suggestion; - Identification of which Licensed Software product and version is affected; - Identification of the operating environment (e.g. operating system, hardware - Platform, build tools, etc.) on which the problem exists; + Platform, build tools, tool configuration, etc.) on which the problem exists; +- Marking the issue as a Security Issue, when reporting a Security Issue; - On Standard Support: A complete and compilable test case of not more than 500 lines of code that demonstrates the problem; - On Premium Support: A complete and compilable test case that demonstrates the @@ -1800,29 +1836,30 @@ Each version or release of the Licensed Software will be Supported under Standard Support or Premium Support only for limited time period as set forth -in doc.qt.io. For example, regular releases of Qt Software are supported for -one (1) year from the release date of the version x.y.0 and Long Term Support -(LTS) Releases are supported for a period of three (3) years from the release -date of the LTS version x.y.0. - -The Qt Company shall only provide Support for Designated User(s). - -Support is made available for the entire development teams only: It is not -allowed to purchase Support only for some members of the development team, and -all Designated Users of the respective development team must be eligible for -the same level of Support. +in doc.qt.io or in documentation provided with the respective Licensed Software +product. If nothing is documented, a release of Licensed Software is supported +for one (1) year from the release date of the version x.y.0 and Long Term +Support (LTS) Releases are supported for a period of three (3) years from the +release date of the LTS version x.y.0. + +The Qt Company shall only provide Support for Designated User(s) through +Customer Portal.Support is made available for the entire development teams +only: It is not allowed to purchase Support only for some members of the +development team, and all Designated Users of the respective development team +must be eligible for the same level of Support. Support is not provided for snapshots, preview releases, beta releases or release candidates. -The Qt Company shall have no obligation to provide Support for hardware or -operating system specific problems or problems arising from improper use, -accident, neglect or modification of Qt. +The Qt Company shall have no obligation to provide Support for 3rd party +components, hardware or operating system specific problems or problems arising +from improper use, accident, neglect, or modification of Qt. Limitations with Install Support: -Support limited to Error(s) regarding installation and setting up of the Qt -development environment on host Platforms. +Support limited to (i) Error(s) regarding installation and setting up of the Qt +development environment on host Platforms, or (ii) Errors impacting operational +use of the QA Tools. Limitations with Standard Support: @@ -1848,31 +1885,60 @@ corresponding supported Platform. Premium Support is optional and purchased for an agreed bucket of hours -("Bucket"). Hours can be used by any Designated User in the respective +(âBucketâ). Hours can be used by any Designated User in the respective development team. To encourage continuous usage of the Support, ten percent (10%) of the purchased Bucket shall automatically expire (regardless of whether such support hours are actually used or not by the Licensee) each month after three (3) months from the purchase of the Premium Support. -2.4 Extended Support +2.4 Handling of Security Issues + +The reported Errors marked as Security Issues will be assessed by experts to +determine the severity of the issue and to verify if it indeed is a valid +Security Issue. The Designated User who reported the issue may be contacted for +more details. If the reported issue is not deemed to be a Security Issue, it +will be treated as a normal Error and handled accordingly. + +A verified Security Issue will be fixed as soon as possible. Qt Company will +notify all Licensees via appropriate channels about the Security Errors and +availability of patches for Licensed Software. Typically, a fix for the +Security Issue is included in the next Maintenance Release of Licensed +Software. + +If the Security Issue is reported in a third-party library used in Licensed +Software, The Qt Company will notify the relevant third party of such Security +Issue detected in their library. When the Security Issue is fixed in the +third-party library, the new version of the third-party library will be in the +next feasible Maintenance Release of the Licensed Software. If a fixed version +of the third-party library is not available, The Qt Company may instead decide +to include documentation regarding the issue, or a patch for this third-party +library. + +All known Security Issues in Licensed Software will be mentioned as part of the +change notes released with each version of Licensed Software. + +2.5 Extended Support Extended Support extends the Support Validity Term for a release of Licensed Software that is no longer generally supported. Extended Support includes and is by default provided with Standard Support -rules and limitations, unless Extended Support is purchased with Premium -Support in which case Premium Support rules and limitations will apply. +rules and limitations, unless Extended Support is purchased together with +Premium Support in which case Premium Support rules and limitations will apply. Extended Support is optional and purchased with annual fee and separately per each Licensee product. Extended Support will need definition of (i) Licensee -product, (ii) used Platform(s) and (iii) Licensed Software version(s). - -2.5 Tool Qualification Kit - -The Qt Company shall provide set of customized documents and validation tests -that enable Licensee to qualify QA testing tool for the purpose of ISO 26262, -EN 50128, DO-330, IEC 61508, IEC 62304 or IEC 13485 certification Licensee end -to end solution. +product, (ii) used Platform(s) and (iii) Licensed Software version(s). For +avoidance of doubt, Extended Support requires that the Designated User has a +valid license for the respective Licensed Software. + +2.6 Qualification Kit + +The Qt Company shall provide a set of documents and validation tests that +enable the Licensee to qualify QA testing tool (subject to a separate fee) or +Qt Safe Renderer for the purpose of safety certification of Licensee end-to-end +solution. Exact complied safety standards may vary between products, used +features, use case, and industry. 3 RESPONSE TIME @@ -1885,6 +1951,9 @@ Premium Support: Errors and Support requests will have a Response Time not to exceed one (1) business day. +Security Issues: Errors that are Security Issues will have a Response Time not +to exceed one (1) business day. + For complex issues, The Qt Company may provide an initial response to the Designated User and then follow up, without undue delay, with additional communication before an Error is properly addressed or Support provided. @@ -1908,7 +1977,7 @@ 5 MAINTENANCE RELEASES, UPDATES AND UPGRADES -Under the Support the Customer is eligible for Maintenance Releases and Updates +Under the Support the Licensee is eligible for Maintenance Releases and Updates that The Qt Company generally makes available to customers who has purchased Support. Unless otherwise decided by The Company at its free and absolute discretion, Upgrades will not be provided under the Support. @@ -1920,6 +1989,7 @@ - Fixes related to build issues on supported Platforms; - Error corrections specific to a single Platform that are not present on other Platforms; +- Corrections to Security Issues; - Critical Error corrections such as crashes, data corruption, loss of data, race conditions; and - Updates to documentation and license information when deemed necessary by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/.cmake.conf new/qtwayland-everywhere-src-6.5.1/.cmake.conf --- old/qtwayland-everywhere-src-6.5.0/.cmake.conf 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/.cmake.conf 2023-05-16 11:46:14.000000000 +0200 @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.5.0") +set(QT_REPO_MODULE_VERSION "6.5.1") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/.tag new/qtwayland-everywhere-src-6.5.1/.tag --- old/qtwayland-everywhere-src-6.5.0/.tag 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/.tag 2023-05-16 11:46:14.000000000 +0200 @@ -1 +1 @@ -d711c6a028f27d88ecdd3f59c1e70c19355d921c +3e7d12ffa637912077ceaea29cdef4b9135ab39d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/dependencies.yaml new/qtwayland-everywhere-src-6.5.1/dependencies.yaml --- old/qtwayland-everywhere-src-6.5.0/dependencies.yaml 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/dependencies.yaml 2023-05-16 11:46:14.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: aea92807be2567c4212b96ae67de7137075ba4ee + ref: 55aee8697512af105dfefabc1e2ec41d4df1e45e required: true ../qtdeclarative: - ref: 3238e18d6b0dc45d2e765fb0b93da5cbf3f396ec + ref: 65651dc1d333e2aded18b0d6f0b71c35e5b40c1c required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/examples/wayland/custom-shell/doc/src/custom-shell.qdoc new/qtwayland-everywhere-src-6.5.1/examples/wayland/custom-shell/doc/src/custom-shell.qdoc --- old/qtwayland-everywhere-src-6.5.0/examples/wayland/custom-shell/doc/src/custom-shell.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/examples/wayland/custom-shell/doc/src/custom-shell.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -4,7 +4,7 @@ /*! * \title Custom Shell * \example custom-shell - * \meta category {Embedded} + * \examplecategory {Embedded} * \brief Custom Shell shows how to implement a custom shell extension. * \ingroup qtwaylandcompositor-examples * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/examples/wayland/ivi-compositor/doc/src/ivi-compositor.qdoc new/qtwayland-everywhere-src-6.5.1/examples/wayland/ivi-compositor/doc/src/ivi-compositor.qdoc --- old/qtwayland-everywhere-src-6.5.0/examples/wayland/ivi-compositor/doc/src/ivi-compositor.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/examples/wayland/ivi-compositor/doc/src/ivi-compositor.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -4,7 +4,7 @@ /*! * \title IVI Compositor * \example ivi-compositor - * \meta category {Embedded} + * \examplecategory {Embedded} * \brief IVI Compositor is an example that demonstrates how to use the IviApplication extension. * \ingroup qtwaylandcompositor-examples * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/examples/wayland/minimal-qml/doc/src/minimal-qml.qdoc new/qtwayland-everywhere-src-6.5.1/examples/wayland/minimal-qml/doc/src/minimal-qml.qdoc --- old/qtwayland-everywhere-src-6.5.0/examples/wayland/minimal-qml/doc/src/minimal-qml.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/examples/wayland/minimal-qml/doc/src/minimal-qml.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -4,7 +4,7 @@ /*! * \title Minimal QML * \example minimal-qml - * \meta category {Embedded} + * \examplecategory {Embedded} * \brief Minimal QML is a simple example that demonstrates how to write a Wayland compositor in QML. * \ingroup qtwaylandcompositor-examples * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/examples/wayland/multi-output/doc/src/multi-output.qdoc new/qtwayland-everywhere-src-6.5.1/examples/wayland/multi-output/doc/src/multi-output.qdoc --- old/qtwayland-everywhere-src-6.5.0/examples/wayland/multi-output/doc/src/multi-output.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/examples/wayland/multi-output/doc/src/multi-output.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -4,7 +4,7 @@ /*! \title Multi Output \example multi-output - \meta category {Embedded} + \examplecategory {Embedded} \brief Multi Output is an example that demonstrates a compositor with multiple outputs. \ingroup qtwaylandcompositor-examples diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/examples/wayland/multi-screen/doc/src/multi-screen.qdoc new/qtwayland-everywhere-src-6.5.1/examples/wayland/multi-screen/doc/src/multi-screen.qdoc --- old/qtwayland-everywhere-src-6.5.0/examples/wayland/multi-screen/doc/src/multi-screen.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/examples/wayland/multi-screen/doc/src/multi-screen.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -4,7 +4,7 @@ /*! * \title Multi Screen * \example multi-screen - * \meta category {Embedded} + * \examplecategory {Embedded} * \brief Multi Screen is a desktop-style Wayland compositor for multiple screens. * \ingroup qtwaylandcompositor-examples * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc new/qtwayland-everywhere-src-6.5.1/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc --- old/qtwayland-everywhere-src-6.5.0/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -4,7 +4,7 @@ /*! * \title Overview Compositor * \example overview-compositor - * \meta category {Embedded} + * \examplecategory {Embedded} * \brief Overview Compositor shows how to switch between clients in a grid. * * \section1 Introduction diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/examples/wayland/pure-qml/doc/src/pure-qml.qdoc new/qtwayland-everywhere-src-6.5.1/examples/wayland/pure-qml/doc/src/pure-qml.qdoc --- old/qtwayland-everywhere-src-6.5.0/examples/wayland/pure-qml/doc/src/pure-qml.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/examples/wayland/pure-qml/doc/src/pure-qml.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -4,7 +4,7 @@ /*! \title Pure QML \example pure-qml - \meta category {Embedded} + \examplecategory {Embedded} \brief Pure QML is an example that demonstrates how to write a Wayland compositor in pure QML. \ingroup qtwaylandcompositor-examples diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/examples/wayland/qtshell/doc/src/qtshell.qdoc new/qtwayland-everywhere-src-6.5.1/examples/wayland/qtshell/doc/src/qtshell.qdoc --- old/qtwayland-everywhere-src-6.5.0/examples/wayland/qtshell/doc/src/qtshell.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/examples/wayland/qtshell/doc/src/qtshell.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -4,7 +4,7 @@ /*! * \title QtShell Compositor * \example qtshell - * \meta category {Embedded} + * \examplecategory {Embedded} * \brief QtShell Compositor shows how to use the QtShell shell extension. * \ingroup qtwaylandcompositor-examples * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/examples/wayland/server-side-decoration/doc/src/server-side-decoration.qdoc new/qtwayland-everywhere-src-6.5.1/examples/wayland/server-side-decoration/doc/src/server-side-decoration.qdoc --- old/qtwayland-everywhere-src-6.5.0/examples/wayland/server-side-decoration/doc/src/server-side-decoration.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/examples/wayland/server-side-decoration/doc/src/server-side-decoration.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -4,7 +4,7 @@ /*! * \title Server Side Decoration Compositor * \example server-side-decoration - * \meta category {Embedded} + * \examplecategory {Embedded} * \brief Server Side Decoration Compositor is a simple example that demonstrates server side window decorations on xdg-shell. * \ingroup qtwaylandcompositor-examples * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/examples/wayland/spanning-screens/doc/src/spanning-screens.qdoc new/qtwayland-everywhere-src-6.5.1/examples/wayland/spanning-screens/doc/src/spanning-screens.qdoc --- old/qtwayland-everywhere-src-6.5.0/examples/wayland/spanning-screens/doc/src/spanning-screens.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/examples/wayland/spanning-screens/doc/src/spanning-screens.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -4,7 +4,7 @@ /*! * \title Spanning Screens * \example spanning-screens - * \meta category {Embedded} + * \examplecategory {Embedded} * \brief Spanning Screens is an example that demonstrates how to let Wayland clients span multiple screens. * \ingroup qtwaylandcompositor-examples * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/client/global/qwaylandclientextension.cpp new/qtwayland-everywhere-src-6.5.1/src/client/global/qwaylandclientextension.cpp --- old/qtwayland-everywhere-src-6.5.0/src/client/global/qwaylandclientextension.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/client/global/qwaylandclientextension.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -6,10 +6,6 @@ #include "qwaylandclientextension_p.h" #include <QtWaylandClient/private/qwaylanddisplay_p.h> #include <QtWaylandClient/private/qwaylandintegration_p.h> -#include <QtGui/QGuiApplication> -#include <QtGui/qpa/qplatformnativeinterface.h> -#include <QtGui/private/qguiapplication_p.h> -#include <QtCore/QDebug> QT_BEGIN_NAMESPACE @@ -19,12 +15,9 @@ { // Keep the possibility to use a custom waylandIntegration as a plugin, // but also add the possibility to run it as a QML component. - waylandIntegration = static_cast<QtWaylandClient::QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration()); + waylandIntegration = QtWaylandClient::QWaylandIntegration::instance(); if (!waylandIntegration) waylandIntegration = new QtWaylandClient::QWaylandIntegration(); - - if (!waylandIntegration->nativeInterface()->nativeResourceForIntegration("wl_display")) - qWarning() << "This application requires a Wayland platform plugin"; } void QWaylandClientExtensionPrivate::globalAdded(const RegistryGlobal &global) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/client/qwaylanddisplay.cpp new/qtwayland-everywhere-src-6.5.1/src/client/qwaylanddisplay.cpp --- old/qtwayland-everywhere-src-6.5.0/src/client/qwaylanddisplay.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/client/qwaylanddisplay.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -371,17 +371,21 @@ #if QT_CONFIG(cursor) mCursorThemes.clear(); #endif - if (mDisplay) - wl_display_disconnect(mDisplay); if (m_frameEventQueue) wl_event_queue_destroy(m_frameEventQueue); + + if (mDisplay) + wl_display_disconnect(mDisplay); } // Steps which is called just after constructor. This separates registry_global() out of the constructor // so that factory functions in integration can be overridden. -void QWaylandDisplay::initialize() +bool QWaylandDisplay::initialize() { + if (!isInitialized()) + return false; + forceRoundTrip(); if (!mWaitingScreens.isEmpty()) { @@ -390,6 +394,8 @@ } if (!mClientSideInputContextRequested) mTextInputManagerIndex = INT_MAX; + + return qEnvironmentVariableIntValue("QT_WAYLAND_DONT_CHECK_SHELL_INTEGRATION") || shellIntegration(); } void QWaylandDisplay::ensureScreen() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/client/qwaylanddisplay_p.h new/qtwayland-everywhere-src-6.5.1/src/client/qwaylanddisplay_p.h --- old/qtwayland-everywhere-src-6.5.0/src/client/qwaylanddisplay_p.h 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/client/qwaylanddisplay_p.h 2023-05-16 11:46:14.000000000 +0200 @@ -97,7 +97,7 @@ QWaylandDisplay(QWaylandIntegration *waylandIntegration); ~QWaylandDisplay(void) override; - void initialize(); + bool initialize(); #if QT_CONFIG(xkbcommon) struct xkb_context *xkbContext() const { return mXkbContext.get(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandinputdevice.cpp new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandinputdevice.cpp --- old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandinputdevice.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandinputdevice.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -864,7 +864,7 @@ mButtons = Qt::NoButton; if (auto *window = focusWindow()) { - MotionEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, mParent->modifiers()); + ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, Qt::NoButton, mParent->modifiers()); window->handleMouse(mParent, e); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandintegration.cpp new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandintegration.cpp --- old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandintegration.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandintegration.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -73,6 +73,8 @@ namespace QtWaylandClient { +QWaylandIntegration *QWaylandIntegration::sInstance = nullptr; + QWaylandIntegration::QWaylandIntegration() #if defined(Q_OS_MACOS) : mFontDb(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>) @@ -81,17 +83,21 @@ #endif { mDisplay.reset(new QWaylandDisplay(this)); - if (!mDisplay->isInitialized()) { - mFailed = true; - return; - } QWaylandWindow::fixedToplevelPositions = !qEnvironmentVariableIsSet("QT_WAYLAND_DISABLE_FIXED_POSITIONS"); + + sInstance = this; } QWaylandIntegration::~QWaylandIntegration() { + sInstance = nullptr; +} + +bool QWaylandIntegration::init() +{ + return mDisplay->initialize(); } QPlatformNativeInterface * QWaylandIntegration::nativeInterface() const @@ -163,7 +169,7 @@ // Support platform specific initialization void QWaylandIntegration::initializePlatform() { - mDisplay->initialize(); + mDisplay->initEventThread(); mNativeInterface.reset(createPlatformNativeInterface()); initializeInputDeviceIntegration(); @@ -179,14 +185,9 @@ void QWaylandIntegration::initialize() { - mDisplay->initEventThread(); - - // Call this after initializing event thread for QWaylandDisplay::forceRoundTrip() initializePlatform(); - // But the aboutToBlock() and awake() should be connected after initializePlatform(). - // Otherwise the connected flushRequests() may consumes up all events before processEvents starts to wait, - // so that processEvents(QEventLoop::WaitForMoreEvents) may be blocked in the forceRoundTrip(). + // Call this after initializing event thread for QWaylandDisplay::flushRequests() QAbstractEventDispatcher *dispatcher = QGuiApplicationPrivate::eventDispatcher; QObject::connect(dispatcher, SIGNAL(aboutToBlock()), mDisplay.data(), SLOT(flushRequests())); QObject::connect(dispatcher, SIGNAL(awake()), mDisplay.data(), SLOT(flushRequests())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandintegration_p.h new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandintegration_p.h --- old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandintegration_p.h 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandintegration_p.h 2023-05-16 11:46:14.000000000 +0200 @@ -41,7 +41,9 @@ QWaylandIntegration(); ~QWaylandIntegration() override; - bool hasFailed() { return mFailed; } + static QWaylandIntegration *instance() { return sInstance; } + + bool init(); bool hasCapability(QPlatformIntegration::Capability cap) const override; QPlatformWindow *createPlatformWindow(QWindow *window) const override; @@ -131,12 +133,13 @@ #if QT_CONFIG(accessibility) mutable QScopedPointer<QPlatformAccessibility> mAccessibility; #endif - bool mFailed = false; QMutex mClientBufferInitLock; bool mClientBufferIntegrationInitialized = false; bool mServerBufferIntegrationInitialized = false; bool mShellIntegrationInitialized = false; + static QWaylandIntegration *sInstance; + friend class QWaylandDisplay; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandnativeinterface.cpp new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandnativeinterface.cpp --- old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandnativeinterface.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandnativeinterface.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -159,7 +159,7 @@ { QByteArray lowerCaseResource = resourceString.toLower(); - if (lowerCaseResource == "output") + if (lowerCaseResource == "output" && !screen->handle()->isPlaceholder()) return ((QWaylandScreen *) screen->handle())->output(); return nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandvulkanwindow.cpp new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandvulkanwindow.cpp --- old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandvulkanwindow.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandvulkanwindow.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -14,11 +14,7 @@ QWaylandVulkanWindow::~QWaylandVulkanWindow() { - if (m_surface) { - QVulkanInstance *inst = window()->vulkanInstance(); - if (inst) - static_cast<QWaylandVulkanInstance *>(inst->handle())->destroySurface(m_surface); - } + invalidateSurface(); } QWaylandWindow::WindowType QWaylandVulkanWindow::windowType() const @@ -26,6 +22,17 @@ return QWaylandWindow::Vulkan; } +void QWaylandVulkanWindow::invalidateSurface() +{ + if (m_surface) { + QVulkanInstance *inst = window()->vulkanInstance(); + if (inst) + static_cast<QWaylandVulkanInstance *>(inst->handle())->destroySurface(m_surface); + } + m_surface = VK_NULL_HANDLE; + QWaylandWindow::invalidateSurface(); +} + VkSurfaceKHR *QWaylandVulkanWindow::vkSurface() { if (m_surface) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandvulkanwindow_p.h new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandvulkanwindow_p.h --- old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandvulkanwindow_p.h 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandvulkanwindow_p.h 2023-05-16 11:46:14.000000000 +0200 @@ -29,6 +29,7 @@ ~QWaylandVulkanWindow() override; WindowType windowType() const override; + void invalidateSurface() override; VkSurfaceKHR *vkSurface(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandwindow.cpp new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandwindow.cpp --- old/qtwayland-everywhere-src-6.5.0/src/client/qwaylandwindow.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/client/qwaylandwindow.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -125,6 +125,8 @@ Q_ASSERT(!mSubSurfaceWindow); auto *parent = static_cast<QWaylandWindow *>(QPlatformWindow::parent()); + if (!parent->mSurface) + parent->initializeWlSurface(); if (parent->wlSurface()) { if (::wl_subsurface *subsurface = mDisplay->createSubSurface(this, parent)) mSubSurfaceWindow = new QWaylandSubSurface(this, parent, subsurface); @@ -262,18 +264,18 @@ void QWaylandWindow::reset() { closeChildPopups(); - delete mShellSurface; - mShellSurface = nullptr; - delete mSubSurfaceWindow; - mSubSurfaceWindow = nullptr; - mViewport.reset(); - mFractionalScale.reset(); if (mSurface) { emit wlSurfaceDestroyed(); QWriteLocker lock(&mSurfaceLock); invalidateSurface(); + delete mShellSurface; + mShellSurface = nullptr; + delete mSubSurfaceWindow; + mSubSurfaceWindow = nullptr; mSurface.reset(); + mViewport.reset(); + mFractionalScale.reset(); } { @@ -367,9 +369,15 @@ { QSize minimum = windowMinimumSize(); QSize maximum = windowMaximumSize(); - QPlatformWindow::setGeometry(QRect(rect.x(), rect.y(), - qBound(minimum.width(), rect.width(), maximum.width()), - qBound(minimum.height(), rect.height(), maximum.height()))); + int width = windowGeometry().width(); + int height = windowGeometry().height(); + if (minimum.width() <= maximum.width() + && minimum.height() <= maximum.height()) { + width = qBound(minimum.width(), rect.width(), maximum.width()); + height = qBound(minimum.height(), rect.height(), maximum.height()); + } + + QPlatformWindow::setGeometry(QRect(rect.x(), rect.y(), width, height)); if (mViewport) updateViewport(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/compositor/compositor_api/qwaylandcompositor.cpp new/qtwayland-everywhere-src-6.5.1/src/compositor/compositor_api/qwaylandcompositor.cpp --- old/qtwayland-everywhere-src-6.5.0/src/compositor/compositor_api/qwaylandcompositor.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/compositor/compositor_api/qwaylandcompositor.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -105,9 +105,9 @@ #if QT_CONFIG(xkbcommon) xkb_state *xkbState = keyb->xkbState(); - Qt::KeyboardModifiers modifiers = QXkbCommon::modifiers(xkbState); const xkb_keysym_t sym = xkb_state_key_get_one_sym(xkbState, code); + Qt::KeyboardModifiers modifiers = QXkbCommon::modifiers(xkbState, sym); int qtkey = QXkbCommon::keysymToQtKey(sym, modifiers, xkbState, code); QString text = QXkbCommon::lookupString(xkbState, code); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/compositor/compositor_api/qwaylandseat.cpp new/qtwayland-everywhere-src-6.5.1/src/compositor/compositor_api/qwaylandseat.cpp --- old/qtwayland-everywhere-src-6.5.0/src/compositor/compositor_api/qwaylandseat.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/compositor/compositor_api/qwaylandseat.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -434,6 +434,11 @@ /*! * Sends the \a event to the keyboard device. + * + * \note The \a event should correspond to an actual keyboard key in the current mapping. + * For example, \c Qt::Key_Exclam is normally not a separate key: with most keyboards the + * exclamation mark is produced with Shift + 1. In that case, to send an exclamation mark + * key press event, use \c{QKeyEvent(QEvent::KeyPress, Qt::Key_1, Qt::ShiftModifier)}. */ void QWaylandSeat::sendFullKeyEvent(QKeyEvent *event) { @@ -513,6 +518,9 @@ * Sends a key press (if \a pressed is \c true) or release (if \a pressed is \c false) * event of a key \a qtKey to the keyboard device. * + * \note This function does not support key events that require modifiers, such as \c Qt::Key_Exclam. + * Use \l{sendFullKeyEvent} instead. + * * \since 5.12 */ void QWaylandSeat::sendKeyEvent(int qtKey, bool pressed) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/compositor/doc/src/qtwaylandcompositor-cpp.qdoc new/qtwayland-everywhere-src-6.5.1/src/compositor/doc/src/qtwaylandcompositor-cpp.qdoc --- old/qtwayland-everywhere-src-6.5.0/src/compositor/doc/src/qtwaylandcompositor-cpp.qdoc 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/compositor/doc/src/qtwaylandcompositor-cpp.qdoc 2023-05-16 11:46:14.000000000 +0200 @@ -5,7 +5,7 @@ \module QtWaylandCompositor \title Qt Wayland Compositor C++ Classes \ingroup modules - \qtcmakepackage Waylandcompositor + \qtcmakepackage WaylandCompositor \qtvariable waylandcompositor \brief Provides C++ classes for writing custom Wayland display servers. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/plugins/hardwareintegration/CMakeLists.txt new/qtwayland-everywhere-src-6.5.1/src/plugins/hardwareintegration/CMakeLists.txt --- old/qtwayland-everywhere-src-6.5.0/src/plugins/hardwareintegration/CMakeLists.txt 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/plugins/hardwareintegration/CMakeLists.txt 2023-05-16 11:46:14.000000000 +0200 @@ -3,9 +3,15 @@ # Generated from hardwareintegration.pro. +# When doing unity build, we get symbol collisions with macros defined +# in X11.h, and Xlib.h +set(CMAKE_UNITY_BUILD OFF) + if(TARGET Qt::WaylandClient) add_subdirectory(client) endif() if(TARGET Qt::WaylandCompositor) add_subdirectory(compositor) endif() + +set(CMAKE_UNITY_BUILD ${QT_UNITY_BUILD}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/plugins/platforms/qwayland-brcm-egl/main.cpp new/qtwayland-everywhere-src-6.5.1/src/plugins/platforms/qwayland-brcm-egl/main.cpp --- old/qtwayland-everywhere-src-6.5.0/src/plugins/platforms/qwayland-brcm-egl/main.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/plugins/platforms/qwayland-brcm-egl/main.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -22,7 +22,7 @@ Q_UNUSED(system); auto *integration = new QWaylandBrcmEglPlatformIntegration(); - if (integration->hasFailed()) { + if (!integration->init()) { delete integration; integration = nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/plugins/platforms/qwayland-egl/main.cpp new/qtwayland-everywhere-src-6.5.1/src/plugins/platforms/qwayland-egl/main.cpp --- old/qtwayland-everywhere-src-6.5.0/src/plugins/platforms/qwayland-egl/main.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/plugins/platforms/qwayland-egl/main.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -22,7 +22,7 @@ Q_UNUSED(system); auto *integration = new QWaylandEglPlatformIntegration(); - if (integration->hasFailed()) { + if (!integration->init()) { delete integration; integration = nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/plugins/platforms/qwayland-generic/main.cpp new/qtwayland-everywhere-src-6.5.1/src/plugins/platforms/qwayland-generic/main.cpp --- old/qtwayland-everywhere-src-6.5.0/src/plugins/platforms/qwayland-generic/main.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/plugins/platforms/qwayland-generic/main.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -22,7 +22,7 @@ Q_UNUSED(system); auto *integration = new QWaylandIntegration(); - if (integration->hasFailed()) { + if (!integration->init()) { delete integration; integration = nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp new/qtwayland-everywhere-src-6.5.1/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp --- old/qtwayland-everywhere-src-6.5.0/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -243,6 +243,22 @@ } } +void QWaylandXdgSurface::Popup::applyConfigure() +{ + if (m_pendingGeometry.isValid()) { + QRect geometryWithMargins = m_pendingGeometry.marginsAdded(m_xdgSurface->m_window->windowContentMargins()); + QMargins parentMargins = m_parent->windowContentMargins() - m_parent->clientSideMargins(); + QRect globalGeometry = geometryWithMargins.translated(m_parent->geometry().topLeft() + QPoint(parentMargins.left(), parentMargins.top())); + m_xdgSurface->setGeometryFromApplyConfigure(globalGeometry.topLeft(), globalGeometry.size()); + } + resetConfiguration(); +} + +void QWaylandXdgSurface::Popup::resetConfiguration() +{ + m_pendingGeometry = QRect(); +} + void QWaylandXdgSurface::Popup::grab(QWaylandInputDevice *seat, uint serial) { m_xdgSurface->m_shell->m_topmostGrabbingPopup = this; @@ -250,6 +266,11 @@ m_grabbing = true; } +void QWaylandXdgSurface::Popup::xdg_popup_configure(int32_t x, int32_t y, int32_t width, int32_t height) +{ + m_pendingGeometry = QRect(x, y, width, height); +} + void QWaylandXdgSurface::Popup::xdg_popup_popup_done() { m_xdgSurface->m_window->window()->close(); @@ -364,6 +385,8 @@ if (m_toplevel) m_toplevel->applyConfigure(); + if (m_popup) + m_popup->applyConfigure(); m_appliedConfigureSerial = m_pendingConfigureSerial; m_configured = true; @@ -393,14 +416,18 @@ if (m_toplevel && m_window) { const int minWidth = qMax(0, m_window->windowMinimumSize().width()); const int minHeight = qMax(0, m_window->windowMinimumSize().height()); - m_toplevel->set_min_size(minWidth, minHeight); - - int maxWidth = qMax(minWidth, m_window->windowMaximumSize().width()); + int maxWidth = qMax(0, m_window->windowMaximumSize().width()); + int maxHeight = qMax(0, m_window->windowMaximumSize().height()); if (maxWidth == QWINDOWSIZE_MAX) maxWidth = 0; - int maxHeight = qMax(minHeight, m_window->windowMaximumSize().height()); if (maxHeight == QWINDOWSIZE_MAX) maxHeight = 0; + + // It will not change min/max sizes if invalid. + if (minWidth > maxWidth || minHeight > maxHeight) + return; + + m_toplevel->set_min_size(minWidth, minHeight); m_toplevel->set_max_size(maxWidth, maxHeight); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h new/qtwayland-everywhere-src-6.5.1/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h --- old/qtwayland-everywhere-src-6.5.0/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h 2023-05-16 11:46:14.000000000 +0200 @@ -115,13 +115,19 @@ Popup(QWaylandXdgSurface *xdgSurface, QWaylandWindow *parent, QtWayland::xdg_positioner *positioner); ~Popup() override; + void applyConfigure(); + void resetConfiguration(); + void grab(QWaylandInputDevice *seat, uint serial); + void xdg_popup_configure(int32_t x, int32_t y, int32_t width, int32_t height) override; void xdg_popup_popup_done() override; QWaylandXdgSurface *m_xdgSurface = nullptr; QWaylandXdgSurface *m_parentXdgSurface = nullptr; QWaylandWindow *m_parent = nullptr; bool m_grabbing = false; + + QRect m_pendingGeometry; }; void setToplevel(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/tests/auto/client/clientextension/tst_clientextension.cpp new/qtwayland-everywhere-src-6.5.1/tests/auto/client/clientextension/tst_clientextension.cpp --- old/qtwayland-everywhere-src-6.5.0/tests/auto/client/clientextension/tst_clientextension.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/tests/auto/client/clientextension/tst_clientextension.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -123,5 +123,17 @@ QCOMPARE(spy.size(), 1); } -QCOMPOSITOR_TEST_MAIN(tst_clientextension) +int main(int argc, char **argv) +{ + QTemporaryDir tmpRuntimeDir; + setenv("XDG_RUNTIME_DIR", tmpRuntimeDir.path().toLocal8Bit(), 1); + setenv("QT_QPA_PLATFORM", "wayland", 1); + setenv("QT_WAYLAND_DONT_CHECK_SHELL_INTEGRATION", "1", 1); + + tst_clientextension tc; + QGuiApplication app(argc, argv); + QTEST_SET_MAIN_SOURCE_PATH + return QTest::qExec(&tc, argc, argv); +} + #include "tst_clientextension.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/tests/auto/client/surface/tst_surface.cpp new/qtwayland-everywhere-src-6.5.1/tests/auto/client/surface/tst_surface.cpp --- old/qtwayland-everywhere-src-6.5.0/tests/auto/client/surface/tst_surface.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/tests/auto/client/surface/tst_surface.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -199,6 +199,10 @@ // Make sure the client doesn't quit before it has a chance to crash xdgPingAndWaitForPong(); + + // Make sure the subsurface was actually created + const Subsurface *subsurface = exec([=] {return subSurface(0);}); + QVERIFY(subsurface); } QCOMPOSITOR_TEST_MAIN(tst_surface) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.5.0/tests/auto/client/xdgshell/tst_xdgshell.cpp new/qtwayland-everywhere-src-6.5.1/tests/auto/client/xdgshell/tst_xdgshell.cpp --- old/qtwayland-everywhere-src-6.5.0/tests/auto/client/xdgshell/tst_xdgshell.cpp 2023-03-28 16:22:59.000000000 +0200 +++ new/qtwayland-everywhere-src-6.5.1/tests/auto/client/xdgshell/tst_xdgshell.cpp 2023-05-16 11:46:14.000000000 +0200 @@ -13,6 +13,7 @@ { Q_OBJECT private slots: + void init(); void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); } void showMinimized(); void basicConfigure(); @@ -31,6 +32,11 @@ void nativeResources(); }; +void tst_xdgshell::init() +{ + setenv("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1", 1); +} + void tst_xdgshell::showMinimized() { // On xdg-shell there's really no way for the compositor to tell the window if it's minimized @@ -239,8 +245,8 @@ QRasterWindow *popup = window.m_popup.get(); QVERIFY(!popup->isExposed()); // wait for configure - //TODO: Verify it works with a different configure window geometry - exec([=] { xdgPopup()->sendConfigure(QRect(100, 100, 100, 100)); }); + QRect rect1 = QRect(100, 100, 100, 100); + exec([=] { xdgPopup()->sendConfigure(rect1); }); // Nothing should happen before the *xdg_surface* configure QTRY_VERIFY(!popup->isExposed()); // Popup shouldn't be exposed before the first configure event @@ -256,6 +262,18 @@ // The client is now going to ack the configure QTRY_COMPARE(popupConfigureSpy.size(), 1); QCOMPARE(popupConfigureSpy.takeFirst().at(0).toUInt(), configureSerial); + QCOMPARE(popup->geometry(), rect1); + + QRect rect2 = QRect(50, 50, 150, 150); + exec([=] { xdgPopup()->sendConfigure(rect2); }); + + const uint configureSerial2 = exec([=] { + return xdgPopup()->m_xdgSurface->sendConfigure(); + }); + + QTRY_COMPARE(popupConfigureSpy.size(), 1); + QCOMPARE(popupConfigureSpy.takeFirst().at(0).toUInt(), configureSerial2); + QCOMPARE(popup->geometry(), rect2); // And attach a buffer exec([&] {
