summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added changelog for QtWaylandv5.7.0-rc1Jani Heikkinen2016-05-251-0/+70
| | | | | | | | | | | Mention user-visible changes from 5.6.0..5.7.0 in QtWaylandClient. Quick mention of QtWaylandCompositor tech preview. Change-Id: I60ced9a062420aad66b222ff3c07b82b2f7c48e2 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Compile with -Wzero-as-null-pointer-constantPaul Olav Tvete2016-05-2510-14/+13
| | | | | | | | Task-number: QTBUG-53619 Change-Id: Idf073287f215113431cad64f85628e010176ab74 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Compile with a namespaced buildPaul Olav Tvete2016-05-256-2/+18
| | | | | | | Change-Id: I839b3bc2f4fbf67bd381bd82fdaf19f7eb096454 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* fix example installOswald Buddenhagen2016-05-251-0/+3
| | | | | | Change-Id: I3d7b995ecbe2e06d9c87aea743d59ee551e1fae4 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* load(qt_plugin) at the endOswald Buddenhagen2016-05-251-3/+2
| | | | | | | amends 5b3f207ed after the merge to 5.7. Change-Id: Iabf29cbf0e24b3b02f19f5fb0cd5feb624169428 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Make example work for the non-streaming casePaul Olav Tvete2016-05-231-2/+7
| | | | | | | | | | | | | | Don't crash when buffer is shared memory. Don't set m_texture to 0 when not streaming. Use the new buffer when advancing. Use proper filtering when uploading to texture. Change-Id: I05bb12a05c7448d17d5292910f16b49e613b0ce0 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Add tech preview warning to READMEPaul Olav Tvete2016-05-201-0/+5
| | | | | Change-Id: Ic43434c15c9753f147c8d54b50fb1992caadc3df Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* Merge remote-tracking branch 'qt/5.7' into 5.7.0Paul Olav Tvete2016-05-20140-1060/+1324
|\ | | | | | | Change-Id: I8396ea4fc9f656accd2e97e3c78570bff64928cd
| * Create a general ShellSurfaceItem to avoid duplicationJohan Klokkhammer Helsing2016-05-2025-971/+901
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XdgSurfaceItem and WlShellSurfaceItem have been removed in favor of the more general ShellSurfaceItem. An XdgSurface or a WlShellSurface can be assigned to the shellSurface property of a ShellSurfaceItem and leaves open the possibility for additional shells. A shared base class for QWaylandXdgSurface and QWaylandWlShellSurface has been added which has a factory method for creating a QWaylandQuickShellIntegration for that shell implementation. The property "shellSurface" on the ShellSurfaceItem allows QML code to attach to signals regardless of whether it's a WlShell or XdgShell client. The pure-qml example has been updated to take advantage of this. Change-Id: I9d3427586e100d6c44a24f319dd8e1486ff062ee Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * Fix buildJohan Klokkhammer Helsing2016-05-201-1/+1
| | | | | | | | | | Change-Id: I8f1338fa6ed807ac309f2b6d7a8265c1bae144b8 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-196-5/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/wayland/qml-compositor/qml-compositor.pro examples/wayland/server-buffer/compositor/compositor.pro Change-Id: Ie6fa21dfbdb71f33e0a4d29d34a824048cf00864
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: Idd975dc68f9f924cf89bfb9cbc1e476032ce6c23
| | * fix example installsv5.6.1-1v5.6.15.6.1Oswald Buddenhagen2016-04-285-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | this actually includes removing the install targets for the sources - this is automated now. Change-Id: I736958d70baabfa4db816abbfc50acacbf2ee23c Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| | * Fix checking the Qt::BypassWindowManagerHint flagGiulio Camuffo2016-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: I24ca4854aa6756f4cea4f4f5a471ffd9bf33c620 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Erik Larsson <erik@ortogonal.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| | * Destroy the subsurface protocol objectsGiulio Camuffo2016-04-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a protocol error the compositor would send when a window changes its parent, because we were creating a new subsurface without destroying the old one. Change-Id: I0855d0582153e0aff37be508d9fb43d22c9ad0b5 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
| * | Move QWaylandClientExtension out of namespacePaul Olav Tvete2016-05-196-26/+6
| | | | | | | | | | | | | | | | | | | | | | | | The class name already has a QWaylandClient prefix. We don't need QtWaylandClient:: in addition. Change-Id: I42f16d43fe414e3388dfdb924e96d9fc2b0b4ba9 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * | Make qwaylandclientexport publicPaul Olav Tvete2016-05-1941-39/+40
| | | | | | | | | | | | | | | | | | | | | ...since it's being used by a public header. Change-Id: I38049c27c8bd4dc793416bf836d79c4226172d38 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * | Remove empty private class QWaylandExtensionTemplatePrivateJohan Klokkhammer Helsing2016-05-1912-26/+16
| | | | | | | | | | | | | | | | | | | | | | | | Previous subclasses are now inheriting directly from QWaylandExtensionPrivate instead. Change-Id: I33ef88867fcf216a7b1441f69b7025bc2a4367dc Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * | Rename private headers to _p.hPaul Olav Tvete2016-05-1919-21/+28
| | | | | | | | | | | | | | | | | | Change-Id: I0f0d1bd8efabc39325eec7dba4166ae0bccbf6ff Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * | Fixed eglStream compositingDominik Holland2016-05-1812-25/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating the eglStream from the fd we also need to create the texture and call stream_consumer_gltexture. Otherwise the wayland client can't create the wayland client surface. Fixed the qwindow-compositor example to use the texture associated to the QWaylandBufferRef when compositing a EXTERNAL_OES target. QML compositing only works when QSG_RENDER_LOOP is set to basic as we need to generate a texture from the gui thread. As the texture is created by the bufferintegration it might end up in a different gl context than the quick item using it. The texture is also deleted together with the buffer, which prevents the use of the texture afterwards. Both problems need to be fixed in follow up commits. Task-number: QTBUG-50850 Change-Id: Ifec67bbe9e4b2a680c871dc4aced37b71b7b6f80 Reviewed-by: Louai Al-Khanji <louai.al-khanji@qt.io> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * | Rename QWaylandExtension to QWaylandCompositorExtensionPaul Olav Tvete2016-05-1840-167/+167
| | | | | | | | | | | | | | | | | | | | | | | | Since we have QWaylandClientExtension Change-Id: Ie8d60322c8e730bda651e06ed5db0fe1359d946e Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * | Add documentation for QWaylandXdgSurface::windowGeometryJohan Klokkhammer Helsing2016-05-151-2/+6
| | | | | | | | | | | | | | | Change-Id: I131b41a4711b2b1094871eeb44adf99906190953 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * | Add popup support to QWaylandQuickCompositor with the wl shell.Erik Larsson2016-05-134-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the shell surface emits the QWaylandShell::setPopup signal the QWaylandQuickWlShellSurfaceItem will move it self into its popup-parent, and also remove all transforms (rotation, scaling, etc.), our new parent already have the same transforms set. During the time a popup is active it installs a filter which handles the closing of popups if the user clicks outside the popup. This requires that the background item of the compositor accepts mouse press. Change-Id: I3e4c3c8728795d4b38a30a9bce178dc315643de2 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * | Rename QWaylandClientExtension's active() to isActive()Giulio Camuffo2016-05-132-3/+3
| | | | | | | | | | | | | | | Change-Id: Idaf14be727af20d308c21f2cf33db6d417765744 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
| * | Fix buildGiulio Camuffo2016-05-131-0/+2
| | | | | | | | | | | | | | | Change-Id: I1f9be6049ca5657b07ca99f873a12b5c2e4b6834 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | Add containsMouse property to QWaylandMouseTrackerJohan Klokkhammer Helsing2016-05-132-0/+37
|/ / | | | | | | | | | | | | | | | | This is useful for enabling and disabling the cursorItem when moving the mouse between outputs. Change-Id: I71cb588314a500a263b39986f7ddcde7951c61d0 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Mark the QtWaylandCompositor API as \preliminaryPaul Olav Tvete2016-05-1216-1/+30
| | | | | | | | | | Change-Id: I85e3a6dd98496005c63a88bc0218bc94301692ba Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | Fix example build dependencyPaul Olav Tvete2016-05-121-0/+2
| | | | | | | | | | | | Change-Id: I5efcfdbee1bcc60d88a693226d234ad585078edb Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Let inputEventsEnabled control mouse press/releasePaul Olav Tvete2016-05-122-9/+15
| | | | | | | | | | | | | | ...in addition to hover events Change-Id: Ibf434acc5e39637dd701f52d867d582339b93de3 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | Postpone QWaylandQuickItem size update after setting outputJohan Klokkhammer Helsing2016-05-061-2/+2
| | | | | | | | | | | | | | | | | | This is needed so the correct scale factor is used (specific for each output). The cursor surfaces for weston-terminal should now scale correctly. Change-Id: I7ae9277439034ce68013fc849753da75be729453 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | QML compositors: Adjust for scale factor when positioning subsurfacesJohan Klokkhammer Helsing2016-05-041-1/+2
| | | | | | | | | | Change-Id: If861f790546e96aa1ee3781bbbed32ae423f49ba Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | Don't send release events for uncommitted buffersJohan Klokkhammer Helsing2016-05-041-1/+2
| | | | | | | | | | | | | | Fixes crashing GTK clients. Change-Id: I8d2717aa290a7a668af1b8b978447fbefd8ae665 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Move subsurface test application to tests/manualPaul Olav Tvete2016-05-027-0/+0
| | | | | | | | | | | | Change-Id: Ib69594d0c69238311d417f7b2954529c10da1ff6 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | QtWaylandCompositor: Add support for different EGL buffer formatsLouai Al-Khanji2016-04-2919-194/+680
| | | | | | | | | | Change-Id: Idfeeedbf247fa81dccdf28a1aa04f878900ed262 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | QML compositor: Scale surfaces if bufferScale is not setJohan Klokkhammer Helsing2016-04-291-5/+6
| | | | | | | | | | | | | | | | If bufferScale is not set to match the output scale factor, scale the QWaylandQuickItem accordingly. Change-Id: I2c9e8679ad6eccda9e8e752aaca217d5352bb23e Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | QML compositor: Adjust for scale factor when handling mouse eventsJohan Klokkhammer Helsing2016-04-294-10/+14
| | | | | | | | | | | | | | | | | | | | | | Problem: We expose a scaleFactor property on QWaylandOutput, but it's not taken into account when handling mouse events. Resulting in wrong position for clicks, incorrect resizing etc. Solution: Divide by scale factor where appropriate. Change-Id: I21f54b7d2d212a320098fea5c9ae9751e79a0141 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Update the plugins.qmltypes fileGiulio Camuffo2016-04-291-3/+196
| | | | | | | | | | Change-Id: I1d8522925611db4522f579fb4d62e205387d9b17 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | Automatically initialize the quick extension objectsGiulio Camuffo2016-04-298-32/+15
| | | | | | | | | | | | | | | | | | Instead of writing "Component.onCompleted: initialize()" for every extension the compositor has, let them call that automatically. Change-Id: I0b499a38c2b475dc9a7ef27cbacebef19b196dbf Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | Rename the quick extension macrosGiulio Camuffo2016-04-293-39/+27
| | | | | | | | | | | | | | | | | | | | | | | | This patch renames Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS to Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CONTAINER_CLASS and Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS to Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS to reflect better their purpose. Change-Id: I8947f8bd99d12d2dfb8572ee88c129128fe6cb2b Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Compositor API: Add bufferScale property to QWaylandSurfaceJohan Klokkhammer Helsing2016-04-294-0/+48
| | | | | | | | | | Change-Id: I1d4e4b65e5a58e3f314551bb10226fa58650becb Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | QWaylandQuickItem: Fix potential null-pointer dereferenceLouai Al-Khanji2016-04-281-1/+4
| | | | | | | | | | Change-Id: Ibe1b32f3bc55854b23fafdb9cd2d50754b193a87 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | Remove left over filesLouai Al-Khanji2016-04-272-197/+0
| | | | | | | | | | Change-Id: I725eb0561c6f92e4698d85a1ca7ac7b9a700ebbd Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | Update the virtual keyboard importJan Arne Petersen2016-04-261-1/+1
| | | | | | | | | | | | | | Qtvirtual Keyboard dropped the enterprise from its import names. Change-Id: Ie7bfda14d77d0e72fa25ef85d9762a8ca62a87ab Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | QML API for xdg-shellJohan Klokkhammer Helsing2016-04-2610-1/+593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposes QWaylandXdgShell and QWaylandXdgSurface as QML types, along with a new QWaylandXdgSurfaceItem. All of this mirrors the implementation of wl_shell closely. The biggest difference is how resize is handled. There is now some duplication in the window chrome implementation of the pure-qml compositor. This may be improved by refactoring the existing API for shell extensions. Change-Id: I4f2ceff7e0462034cd295a27c3eefea457cc9b96 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | Add window manager extension to the pure-qml examplePier Luigi Fiorini2016-04-252-0/+14
| | | | | | | | | | Change-Id: I50a5ab6156fabac93bcc706bb49fb7dc92cf342d Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Make window manager extension QML friendlyPier Luigi Fiorini2016-04-255-24/+85
| | | | | | | | | | Change-Id: Ie6564144e72a9e5e30222a8d2b30f2ff6c8c961c Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Add QML api for client side extension.Erik Larsson2016-04-218-4/+236
| | | | | | | | | | | | | | | | | | | | | | This makes it simple to use client-side extensions in QML. The only thing that the user needs to do is register the extension class using qmlRegisterType() and the use the extension in QML. Also adds simple QML example which uses client-side extension. Change-Id: I2db99861d97c7bca5cfdbf86ba3a8ccc50fb24b0 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Move drag icon relative the cursor hotspot positionErik Larsson2016-04-217-10/+19
| | | | | | | | | | | | | | | | | | | | Instead of placing the drag icons top-left corner at the cursors hotspot the drag icon is moved so it will be placed correct relative the cursor hotspot. This will makes the drag feeling more realistic. Change-Id: I8d60ae1b7788accb9034575983417abae4c58c1a Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Fix test buildPier Luigi Fiorini2016-04-211-0/+2
| | | | | | | | | | | | | | Compiler cannot find wl_display_flush_clients() due to missing include. Change-Id: Ia703d100b9e509f7666580d50cca9b8ac44b656b Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | QML API for subsurfacesPaul Olav Tvete2016-04-203-2/+76
| | | | | | | | | | | | Task-number: QTBUG-49809 Change-Id: I433fd5ee4d920e6fc6696627b45738631ab329c4 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
View Lorry Controller Status