summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.9.3' into 5.10.0" into ↵v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Jani Heikkinen2017-11-211-0/+52
|\ | | | | | | refs/staging/5.10.0
| * Merge remote-tracking branch 'origin/5.9.3' into 5.10.0Liang Qi2017-11-211-0/+52
| |\ | | | | | | | | | Change-Id: I56d936d60b3909433ca04d3da74dbe23404f34f0
| | * Add changes file for Qt 5.9.3v5.9.3Paul Olav Tvete2017-11-091-0/+52
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-64188 Change-Id: If4b88cf67abfb1154b1d7520d0c9f88583427d93 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Revert "Ref count buffer usage"Johan Klokkhammer Helsing2017-11-212-4/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | When a buffer is committed multiple times, not all compositors (i.e. Weston) send a matching number of release events. This caused clients to freeze on some occasions on those compositors because they were waiting for a release event that never came. This reverts commit 5f38652cd52c03e9df8600f5f41e044820c3062c. Task-number: QTBUG-64631 Change-Id: I818d9bd71e5d9ce7a351a2010914b7219b1975bc Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-203-2/+10
|\ \ | | | | | | | | | Change-Id: Ieb3abe997b444fc46218cd2a1d00a5cfaf37f7b1
| * | pure-qml example: fix position of XdgShellV6 popupsShawn Rutledge2017-11-201-2/+1
| | | | | | | | | | | | | | | | | | | | | Menus open up at the right place this way. Change-Id: Iae18fdcefe33356e9e9ee105b9f5c597bb6c896b Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-152-0/+9
| |\| | | | | | | | | | Change-Id: Ieb5a74f4741834a62cb1db03de2bb23eb060be74
| | * Add missing change signals for geometry and availableGeometryJohan Klokkhammer Helsing2017-11-061-0/+8
| | | | | | | | | | | | | | | Change-Id: I836be9a52fce41490ac4511f4d21d130abec7f55 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| | * Emit change signal when assigning socket name automaticallyJohan Klokkhammer Helsing2017-11-061-0/+1
| | | | | | | | | | | | | | | Change-Id: I6f92d5731e5f53fef37c442fd56e7e8260d8c4cb Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | | Add changes file for Qt 5.10.0Paul Olav Tvete2017-11-101-0/+41
|/ / | | | | | | | | | | Change-Id: Id8bf04b1b56667056dfa3254242c7610f3a6d2a9 Reviewed-by: Andy Nichols <andy.nichols@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.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>
* | Update to new QRandomGenerator APIThiago Macieira2017-11-031-1/+1
| | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'qt/5.9' into 5.10v5.10.0-beta3Paul Olav Tvete2017-10-2567-278/+1340
|\| | | | | | | Change-Id: I6c283081669594b3e8c6b30194bb96e389319cb2
| * Support threaded rendering for Nvidia EGLStreamsPaul Olav Tvete2017-10-253-44/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | Create and update the texture on the GUI thread. Make sure there is a valid context on the GUI thread: create one if necessary, and share it with the global share context. Note: this requires that threaded compositors set the Qt::AA_ShareOpenGLContexts application attribute. Task-number: QTBUG-63039 Change-Id: Ia19af0536f9df319cde84221ed53db1c2ef42293 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Ensure QWaylandWindow::transientParent has a shell surfaceJohan Klokkhammer Helsing2017-10-251-11/+16
| | | | | | | | | | | | | | | | | | | | This may not be a perfect solution, but it's better than the current one, where the transient parent may not have a shell surface (because the window may be hidden or not yet initialized). Task-number: QTBUG-63840 Change-Id: Ia5f04376d4b6d12b41ceeab5ba13cdc1b63b4e3c Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Compositor: Add missing QWaylandOutput::windowChanged emitJohan Klokkhammer Helsing2017-10-241-0/+1
| | | | | | | | | | Change-Id: If02092ad3b9042e8f771f2bc55daed7a810191bd Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Add documentation for XdgShellV5 signalsJohan Klokkhammer Helsing2017-10-241-0/+92
| | | | | | | | | | Change-Id: I6bb9385c709537a3ad924ad936bb87747e2ced7a Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Ref count buffer usageDavid Edmundson2017-10-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QPlatformBackingStore can get flushed multiple times between paints. Flush sets the front buffer, but it does not create a new backbuffer. We can't do so without doing an expensive pre-emptive copy. This means we send the same front buffer multiple times. This is somewhat questionable with regards to the Wayland specification, but seems to work. If we do send a buffer multiple times we can't consider it free until the last attached buffer is released; otherwise we end up painting into a buffer whilst the server is still using it, leading to flickering. Change-Id: I8235eed6a85f0d52b37544e7bcb623b16a9dd832 Reviewed-by: Marco Martin <mart@kde.org> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Add documentation for XdgSurfaceV5 signalsJohan Klokkhammer Helsing2017-10-201-1/+129
| | | | | | | | | | Change-Id: If1e3304cb9a8da2aeb20802759370bc2f0f476dd Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Fix crash when wl-shell setType is called with a hidden parentJohan Klokkhammer Helsing2017-10-202-2/+48
| | | | | | | | | | | | | | | | Fall back to creating a toplevel instead Change-Id: If7db27d08b79e4f9f8c82fa8f9bf73abdb2585d9 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Fix outdated BSD license headerKai Koehne2017-10-2018-46/+226
| | | | | | | | | | Change-Id: Ib1ee37ca626afad14b65303a3cfb134485ade736 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix outdated FDL license headerKai Koehne2017-10-2011-51/+51
| | | | | | | | | | Change-Id: Id4ba079514c7844821adac3c0c108af7deb57889 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix crash after destroying view with mouse focusJohan Klokkhammer Helsing2017-10-1812-78/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't emit QWaylandSeat::mouseFocusChanged with a destroyed QWaylandView. QWaylandPointer has been refactored to make it easier to follow enter and leave logic. A missing emit for buttonPressedChanged has been fixed as well. This also adds a test for pointer events to verify that setting mouse focus works and that the crash has been fixed. Task-number: QTBUG-63208 Change-Id: Id0c174a7b609dfd0152f3ae446dd51fd8befd554 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Fix incorrect documentation for QWaylandWlShellSurface::surfaceRequestedJohan Klokkhammer Helsing2017-10-171-6/+25
| | | | | | | | | | | | | | And add documentation for QWaylandWlShellSurface::surfaceCreated Change-Id: Iea730b7aee8403f0accae686d9d0fbbf086c7d86 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Compositor documentation: Specify return types for objectsJohan Klokkhammer Helsing2017-10-1710-21/+22
| | | | | | | | | | | | Change-Id: I9ff21c7d8b085be8fbcb102b5284ec1ac5dfb40b Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Documentation: update examples for extensionsJohan Klokkhammer Helsing2017-10-162-3/+3
| | | | | | | | | | | | Change-Id: If8840594b4077a464e97b4cb6db2fe8b70edf70d Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| * QWaylandWindow: reset window should reset maskChristophe Chapuis2017-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | When QWaylandWindow::reset() is called, the window's mask is not changed. It means that when the window will be initialized again, it will not re-send the mask description to the server side through Wayland. Task-number: QTBUG-62638 Change-Id: I07d561f466836bbd90ae58521c0768ed85554256 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Christophe Chapuis <chris.chapuis@gmail.com>
| * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+62
| |\ | | | | | | | | | Change-Id: I1c88d93c70fc070446537c425c285443c502a22d
| | * Merge 5.9 into 5.9.2v5.9.2Oswald Buddenhagen2017-09-251-1/+6
| | |\ | | | | | | | | | | | | Change-Id: I13840441f4beeb8160efc40047e0648891349394
| | * | Add changes file for Qt 5.9.2Paul Olav Tvete2017-09-221-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-62745 Change-Id: Ice852c29ce83721fac0a30fd90870531b3562126 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * | | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | | | | | Change-Id: I45e27ba5b9563aeb8499c297d9de618bf639812b
| * | | Add non-global object to custom extension examplePaul Olav Tvete2017-10-057-11/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show how to create non-global objects on the client side. Also fix error in the XML file: move the enum outside the event. Change-Id: I85b4cae115a57d60eda4a54d652ea98a8cd39548 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | | | Docs: Bump compositor module version to 1.1v5.10.0-beta2Johan Klokkhammer Helsing2017-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Icbb93367f2d9f08261b450c97f9e7fb1820b4ee3 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | | | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1Liang Qi2017-10-0413-53/+123
|\| | | | | | | | | | | | | | | Change-Id: I83392c13a9cea972fbb570a9510a19f401675283
| * | | Add missing QML documentation for IviSurfaceJohan Klokkhammer Helsing2017-10-031-3/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: I4b84d7eac0016dccaa370419487940e32130617e Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | | Add missing documentation for IviApplicationJohan Klokkhammer Helsing2017-10-031-0/+43
| | | | | | | | | | | | | | | | | | | | Change-Id: I7f958175fdb5ae21babae259bf2e8d5e749cd396 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | | Remove duplicate QML documentation of Shell.focusPolicyJohan Klokkhammer Helsing2017-10-031-7/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6c972b79555d41cba9e8c5954e595f76b580725b Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | | Add QML documentation for WaylandSeatJohan Klokkhammer Helsing2017-10-031-0/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I71f6714f2ac4d92baedd89246d57f20c159bda1b Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | | Update documentation for QWaylandQuickShellSurfaceItemJohan Klokkhammer Helsing2017-10-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I80b4f078d63ac32d9ce6d91fc46f0b9d9d7d7146 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | | Prevent '* * *' from appearing in WaylandView documentationJohan Klokkhammer Helsing2017-10-031-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation was missing the proper indentation. Change-Id: I3ce2afd8b9ea8c045f54202f942a8f55f831c1b2 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | | Compositor: Add missing cursorSurfaceChanged signalJohan Klokkhammer Helsing2017-10-022-1/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I23a67b8189ab84e6a70c9e3de5da15cf2e9a9d77 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * | | Documentation: Fix missing renames from Xdg* to Xdg*V5Johan Klokkhammer Helsing2017-10-024-29/+29
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia60e20a15151a76c337872bf46b4d09da519387c Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| * | | The ping method belongs to XdgShellV5, not XdgSurfaceJohan Klokkhammer Helsing2017-09-271-1/+1
| | |/ | |/| | | | | | | | | | Change-Id: I9f2ed6411ab0e24a2a6e6f194abe3ffaaba96756 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| * | Make minimal-cpp work with EGLStreamsPaul Olav Tvete2017-09-211-1/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | Redo change 955ac0d0eeaf2f543676b649291558f4dcce37c3 for the minimal compositor example. EGL_KHR_stream_consumer_gltexture only allows connecting to the texture bound to GL_TEXTURE_EXTERNAL_OES, meaning that assumptions about the target always being GL_TEXTURE_2D break horribly. Change-Id: If5b21d740eb80486e4f55bee843a820f0b0edd60 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Add missing documentation for XdgShellV6Johan Klokkhammer Helsing2017-10-031-0/+39
| | | | | | | | | | Change-Id: Ifc7682614ee4e2691dface73ceace20fd4f6effa Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Documentation: Add QML return types for XdgShellV6* typesJohan Klokkhammer Helsing2017-10-021-6/+6
| | | | | | | | | | | | | | And also fix copy-paste error for parentXdgSurface Change-Id: Ife15e8fc7a59a0effa0c9f00689273db3699eca6 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | doc: Expand the overview docs of Qt Wayland CompositorEskil Abrahamsen Blomfeldt2017-09-261-4/+52
| | | | | | | | | | | | | | | | | | | | | | There is some confusion with regards to what types of features the Wayland Compositor provides and how it related to application managers. This tries to expand the entry point description in the docs to give a more detailed description. Change-Id: I96f58c04646c69575a1bd4e4b9178c5722d752d6 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-09-2011-62/+229
|\| | | | | | | Change-Id: I76bfc271efcf75c75bf38f4bf58503e1d2a00839
| * Fix server buffer integration override logicPaul Olav Tvete2017-09-141-1/+1
| | | | | | | | | | | | | | | | Assign to the actual variable instead of a new one with the same name. Change-Id: I9e4c3525891ff53f0194198b9c11f223df4c14a9 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Set window screen from wl_surface.enter and leave eventsJohan Klokkhammer Helsing2017-09-114-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the pointer mScreen, which would previously cause a crash if the screen was removed. Ensures that QWindow::screen() is correct, except in the cases where: - The compositor has not yet sent enter and leave events (in which case the primary output is returned). - The compositor is not sending enter and leave events (although this is mandatory, some compositors don't do this). - The application developer has tried to move the window with QWindow::setScreen(QScreen *). Since there is no way for a client to ask to be moved to a specific monitor in windowed mode, we return the requested screen until a new enter or leave event is received. This will also be useful when implementing/fixing features where the current screen matters. Examples are QT_AUTO_SCREEN_SCALE_FACTOR and the optional output parameter to wl_shell_surface.set_fullscreen. Task-number: QTBUG-62044 Change-Id: Iafde2e278fbc8876e8dafe5b2a4d2482fdc7961a Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>