summaryrefslogtreecommitdiffstats
path: root/src/imports/compositor/compositor.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove QMake project filesJoerg Bornemann2021-02-111-20/+0
| | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I57922bff138258f5b35d484caa4b00d84e924a06 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Make .qml types from QtWayland.Compositor available in pluginEskil Abrahamsen Blomfeldt2020-08-251-0/+9
| | | | | | | | | | | | | | We move the .qml files back to the plugin directory, since the way everything is designed, these should reside next to the qmldir file. Also, the cmake build files will now know about the .qml files when generating the qmldir that replaces the handwritten one (which will be removed later on) Fixes: QTBUG-86164 Change-Id: I1e45b585fa300968e5605aa5741e45ed594bfab7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Port QtWayland.Compositor to new QML extension APIEskil Abrahamsen Blomfeldt2020-08-201-15/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | In order to add new properties and types in Qt 6, we need to port everything over to the new extension API in QML. This is generally more type safe and needs less manual maintenance, but there is some work involved in porting. The previous version exposed some types from the QtWaylandCompositor C++ library, extended a few of them with Qt Quick-specific subclass, added one additional C++-implemented type (QWaylandMouseTracker) and two additional QML-implemented types. We need all types to be defined in the same place for the automatic generation of plugins.qmltypes to work. Therefore all the additional types are moved from the plugin into the library, but still not exposed through public API. The plugin still exposes the types, so for the user this change will be transparent. Fixes: QTBUG-85512 Change-Id: I46e9e80424c9299c3eaee92773d233b1ec29cf2c Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Remove autogenerated .qrc file in compositor importEskil Abrahamsen Blomfeldt2020-07-071-26/+5
| | | | | | | | | | This code would unconditionally generate a qrc file for two .qml files instead of just adding the qrc file to the repository for some reason. This caused problems in the conversion to cmake. Change-Id: Ib859e51155847f72d646ce174259d3b8ba5ca93d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Update QtWayland.Compositor version to match Qt versionEskil Abrahamsen Blomfeldt2020-07-071-1/+1
| | | | | | | | | | | | | | | | | The new convention is to match the C++ module version in the QML import. QtWaylandCompositor is technically a new type, since it was previously named QtWayland.Compositor, but since it might make porting easier, we keep the revision history for QtWayland.Compositor intact and keep \since tags in documentation etc. This also removes the QtQuick.Window import from the QML files (the Window class has been moved to QtQuick) and removes the versioned import per the new standard. Task-number: QTBUG-68840 Change-Id: I40483c7e16d92915adf08d0ff3c5d48af04db6af Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-2/+0
|\ | | | | | | Change-Id: I5d587b79b96d2b44f1975419a658c259c63fa30d
| * Make QT_WAYLAND_COMPOSITOR_QUICK a featureUlf Hermann2019-08-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The define was only set when building Qt, not when including public headers in application code. Therefore, the sizes of objects did not match between the client code that calls new and the constructor inside Qt. Unfortunately, adding the additional members breaks binary compatibility. This has already happened between 5.11 and 5.12. It just wasn't apparent from the headers. If we removed the members again now, we would break binary compatibility again. Therefore, the best course of action seems to be acknowledging the break and adding the members also in the headers. [ChangeLog][Compositor][Important Behavior Changes] Between version 5.11 and 5.12 binary compatibility for the wayland compositor module was broken by adding an additional member to various classes. This was not apparent from user code as the member was behind an #ifdef which would only be set while compiling Qt. As several versions of Qt incompatible to 5.11 have already been released now, rolling back the incompatible change would introduce further incompatibility. Therefore, the change is made consistent by unconditionally adding the member to the headers. Fixes: QTBUG-75677 Change-Id: I3c1ee309ad8e0cd0b6389a76fd1d91e6e2be495c Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-071-1/+2
|/ | | | | | | | Task-number: QTBUG-73739 Task-number: QTBUG-74042 Change-Id: I2074321978f0c32aabeb0d3d4873c5d12d09946d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Update plugins.qmltypesv5.12.0-beta1Kai Koehne2018-10-011-1/+1
| | | | | | Task-number: QTBUG-70264 Change-Id: Idd4c6b2b7bb032241555a08e2b3e420b1312aa35 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* remove qmldir from resourcesv5.10.0-beta4Shawn Rutledge2017-11-061-2/+1
| | | | | | | | | It must be installed on the filesystem. Duplicating it in resources was always wrong but now causes an error in 5.10. Task-number: QTBUG-64285 Change-Id: Ia8a9e11f92ea68977808bb6e87a818c0ca8d1208 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix virtual table mismatch in QWaylandWlShellSurfacePaul Olav Tvete2017-01-091-0/+2
| | | | | | | | | | | | QWaylandWlShellSurface::createIntegration is a virtual function that is removed if QT_WAYLAND_COMPOSITOR_QUICK is not defined. This macro is defined in src/compositor/... and needs to be replicated here. It is set unconditionally here, since having imports implies having Qt Quick. Change-Id: I563c6de01af12721b0b5f2ec2e9faf787adf6794 Task-number: QTBUG-57838 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
* Remove obsolete defineLouai Al-Khanji2015-10-231-1/+0
| | | | | Change-Id: I858887830fbacc09ed96e4509d4dc257a31bd0ae Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Rename QtCompositor to QtWaylandCompositorJørgen Lind2015-09-101-1/+1
| | | | | | | enable building QtWaylandCompositor by default Change-Id: I7cf34052b304ca9fef55b7e30ef6a6367b5d75f1 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* Remove the default shell functionalityJørgen Lind2015-08-281-1/+0
| | | | | | | | This will be readded in a different way. Also, remove the WaylandSurfaceChrome since it is no longer needed, and just use WaylandView directly Change-Id: I8d4a7b2135d9fdaea7dd3fcd729e55cceebf48fb
* WaylandCursorItemJørgen Lind2015-08-281-2/+7
| | | | Change-Id: Ic6edf6d6e723b8f62e61855958a455096f094c5e
* Add WaylandOutputWindow itemJørgen Lind2015-08-281-0/+1
| | | | | | | | | | and add a convenience getter on the QWaylandQuickSurface to retrieve the window. This is because the window typically in qml will have additional properties which we want to retrieve. Instead of doing surface.output.window we can now do surface.outputWindow which looks cleaner Change-Id: Ia3007583a8a0e8e01444cb3f8819fbc651be14ab
* Update compositor apiJørgen Lind2015-08-281-0/+29
| | | | Change-Id: Id8f1843116ecd3770260b2737527b4c278a849d6
* Add qml plugin for conveniently creating compositors in qmlJørgen Lind2015-08-281-0/+12
Change-Id: I76229c38489d6c72dfad9eace38cd8b6fd03dcae
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 19:06:32 +0000