summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge 5.9 into 5.9.2v5.9.25.9.2Oswald Buddenhagen2017-09-251-1/+6
|\ | | | | | | Change-Id: I13840441f4beeb8160efc40047e0648891349394
| * 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 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>
* 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>
* Close popups in the correct orderPaul Olav Tvete2017-09-072-0/+20
| | | | | | | | | According to the protocol, child popups have to be closed before parents, but QMenuBar/QMenu will sometimes close the parent first. Change-Id: Id027ac483b727a19388df619fe1503d794e12c12 Task-number: QTBUG-62048 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Add change file for Qt 5.6.3Johan Klokkhammer Helsing2017-08-311-0/+31
| | | | | | Task-number: QTBUG-62701 Change-Id: Ia56244d29c1c60f74f736ac091fdfae68b25eae7 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Fix crash when window attach is called without waiting for frame callbacksJohan Klokkhammer Helsing2017-08-313-9/+34
| | | | | | | | | | | | | | | | | | | | | If QWaylandWindow::attach was called before getting the frame callback, it would overwrite mFrameCallback. Hence, all but the last frame callback would still be alive after the QWaylandWindow destructor. When the dangling callbacks got invoked the data pointer was statically casted to the deleted QWaylandWindow, resulting in undefined behavior. In this change we only delete frame callbacks from the render thread, avoiding a race condition we fixed earlier. And we always destroy the frame callback when adding a new one, ensuring that the destructor will clean up the only remaining callback. There's a test confirming that the crash has been fixed. This fixes the flakiness of many of the qtbase auto tests. Change-Id: Iecb08ab48216eac61b1ebc5c0e0664d4aac900c0 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Update documentation for ShellSurfaceItem::shellSurfaceJohan Klokkhammer Helsing2017-08-311-7/+6
| | | | | | | | The old link to XdgSurface was broken due to the rename to V5. Added the other ShellSurface implementations as well. Change-Id: I012501d93353b27bb7bb6e14e56d5baecbdae6c1 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Remove unimplemented method QWaylandTouch::focusDestroyedJohan Klokkhammer Helsing2017-08-241-3/+0
| | | | | Change-Id: I59d43d87e672015560a932c4ab5f376ad657c431 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Send pointer events to all bound resourcesJohan Klokkhammer Helsing2017-08-242-36/+60
| | | | | | | | | | | Previously we would send events to just one of the bound resources. An example of this, is the breeze Qt style, which would bind to the pointer resource a second time, which resulted in the original resource not receiving any events, which in turn resulted in an unresponsive client. Change-Id: Iac0ffe5d9ef0dfb95db89796515d7eb4a0b38227 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* Remove unimplemented method QWaylandPointerPrivate::focusDestroyedJohan Klokkhammer Helsing2017-08-241-2/+0
| | | | | Change-Id: I83d5692b6361311ba0562b0c3e6e026f392f7ab5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Try -lEGL when checking for wayland-eglJohan Klokkhammer Helsing2017-08-152-2/+4
| | | | | | | | This will detect wayland-egl on an imx6 without pkg-config Change-Id: I9c0fe6eef375fd0431a218c3b0407505c29eead9 Reviewed-by: Karim Pinter <karim.pinter@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Remove unimplemented overload for QWaylandSeat::sendFullKeyEventJohan Klokkhammer Helsing2017-08-151-1/+0
| | | | | Change-Id: I2cc4e0877d5957c0939d62ec66ed2ce72f15e7e6 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Add missing QML documentation for ShellSurfaceItem::moveItemJohan Klokkhammer Helsing2017-08-141-1/+11
| | | | | | | And add a more helpful explanation of the property. Change-Id: Ia5cd31867f5b0be586129abef829e00ee384b346 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Add missing documentation for examplesJohan Klokkhammer Helsing2017-08-144-0/+161
| | | | | | | | Add documentation for the following examples: minimal-qml, ivi-compositor, multi-screen and spanning-screens. Change-Id: Iacb14af9b1c825f08e2092836cb4821db005628d Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Fallback to focusWindow as transient parentMarco Martin2017-08-101-0/+2
| | | | | | | | | | | | | The wayland protocol requires Popup windows to have a transient parent set, in order to correctly position the window on the screen. In Qt, some popup menus don't have it, so they will appear misplaced in the screen. This adds an heuristic which makes transientParent() return the current application focus window, which is an approximation which won't be always correct, but seems to fix most applications Task-number: QTBUG-60932 Change-Id: Icec1e306d3f64f4f00ad735a8c2eedb99e85eabb Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Check surface exists when setting textinput focusDavid Edmundson2017-08-091-2/+4
| | | | | | | | | | QWaylandWindow resets the surface on various events. Handling focus comes in a posted event, so this can be after we've hidden a window and lost a surface. Task-number: QTBUG-61704 Change-Id: I535ff78c6bc2b86816696a08f8eebc47186d1225 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Documentation: ShellSurfaceItem inherits WaylandQuickItemJohan Klokkhammer Helsing2017-08-091-0/+1
| | | | | Change-Id: Ia67fe4f677dd77a6c1b4d7c1762fdefa9a2aed60 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Reset mFrameCallback in destructionDavid Edmundson2017-07-191-1/+3
| | | | | | | | Otherwise we crash if we call reset twice. For example if we call setParent and setVisible together. Change-Id: I7f07825167bf8c3236a80e649a6d6805fd6c868b Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Fix incorrect type for WaylandQuickItem::subsurfaceHandler in docsJohan Klokkhammer Helsing2017-07-131-1/+1
| | | | | Change-Id: I8d08eddb0eb9cd005b29e13818ba27efa11c6872 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* Use a non grabbing zxdg_popup_v6 for tooltipsGiulio Camuffo2017-07-122-5/+7
| | | | | | Change-Id: I9de16c48a1dee7728fb02faa590c112bd656aa09 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* Update .gitignorePaul Olav Tvete2017-07-103-0/+7
| | | | | Change-Id: Iddbfa1f631fe13fd901e0b3a00bafe334da51cf1 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+50
|\ | | | | | | Change-Id: I3c7b030f23004a35715fd82e6062271eb25d55d2
| * Add changes file for 5.9.1v5.9.15.9.1Paul Olav Tvete2017-06-231-0/+50
| | | | | | | | | | Change-Id: Ic0a54fe798e23876bfcb0397e41fabc63acd3b22 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: I7156b617468f802a01b1a3277ffc33383c93e71d
* | Set texture size and format in WaylandEglClientBuffer::toOpenGLTextureJohan Klokkhammer Helsing2017-06-221-0/+13
| | | | | | | | | | Change-Id: I26e3ac4224fb54e1d3fddeef8847f9556effe324 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Add missing breakThiago Macieira2017-06-221-0/+1
| | | | | | | | | | | | | | | | | | Found by GCC 7 qwaylandinputmethodeventbuilder.cpp:110:51: warning: this statement may fall through [-Wimplicit-fallthrough=] Change-Id: Ia3e896da908f42939148fffd14c47fc6058b0933 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Disable the GCC warning about missing initializersThiago Macieira2017-06-222-0/+14
| | | | | | | | | | | | | | | | | | New fields are appended to the structure, so we can't initialize them as we would lose compatibility with earlier versions of libwayland. So just disable the warning. Change-Id: Ia3e896da908f42939148fffd14c4806ce3468e56 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Fix all the warnings about deprecated qLoadPlugin1Thiago Macieira2017-06-227-14/+14
| | | | | | | | | | | | | | | | | | qLoadPlugin is variadic and can take one argument to the plugin loader, so just use that. Change-Id: Ia3e896da908f42939148fffd14c481e367fdb128 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Doc: correct qmlmethod statementNico Vertriest2017-06-192-3/+3
|/ | | | | | Change-Id: I9895a41cdf00bbfd1e41c07c627235a82f16f2c4 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Translucent background supportTasuku Suzuki2017-06-192-2/+10
| | | | | | Change-Id: I6e7b5869097f579020c7a4439441a63a0771e955 Task-number: QTBUG-55956 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Avoid double deletion of mBufferDonald Carr2017-06-161-0/+1
| | | | | | | | | | | Both WaylandBrcmBuffer and WaylandBuffer were calling wl_buffer_destroy(mBuffer) without the derived class nulling the pointer on deletion Change-Id: I66a553a3d11a1ef90bbfe6ad0fb49f40fe1a0bdb Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Set size and format in SharedMemoryBuffer::toOpenGlTextureJohan Klokkhammer Helsing2017-06-161-0/+3
| | | | | | | The texture returned previously would have size (1,1) and format NoFormat Change-Id: Ic627b7ff9d10cc87cd9307f5f18ea96458fae212 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* Fix missing rename from waylandDisplay to displayJohan Klokkhammer Helsing2017-06-131-1/+1
| | | | | | | | | | QWaylandCompositor::waylandDisplay was previously renamed to display, but the libhybris implementation was not updated. Task-number: QTBUG-61183 Change-Id: I80cacb7eeef93375bebd159b676db1147914e8de Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+56
|\ | | | | | | Change-Id: Id5817af985116985bc270e08192dde61600bf726
| * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Paul Olav Tvete2017-05-111-0/+56
| | | | | | | | | | | | | | Listing important changes and bug-fixes. Warning about binary compatibility break. Change-Id: I7e69b83648d2fa5c6b44ad004d0b8464f7dfe577 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Fix setting the window stateGiulio Camuffo2017-05-261-0/+4
| | | | | | | | | | | | Change-Id: I236095aa9103a2a35ecd79e747b8d1ee843a98f1 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | Match WaylandWindow scale to what we set on the buffer, not the screenDavid Edmundson2017-05-182-2/+7
| | | | | | | | | | | | | | | | | | Currently if the screen scale changes we report a new devicePixelRatio to rendering but we don't send a new set_buffer_scale nor do we update the buffer sizes. This leaves us in a corrupt state. Change-Id: I5bb2bd5eec440cd1ce9080cd3a3dc65448f68298 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Set the cursor when the pointer enters the windowGiulio Camuffo2017-05-121-1/+1
| | | | | | | | | | | | Change-Id: I1ff9928bc5d9d1d80ce07561243eeec89c406e36 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Pass modifiers with wheel eventsDavid Edmundson2017-05-123-6/+7
| | | | | | | | | | Change-Id: I345cdeea1357a8f9201a74b2d5e80350b6c42f24 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | send handleScreenGeometryChange with scaled geometryDavid Edmundson2017-05-121-1/+1
| | | | | | | | | | | | Change-Id: Ia9c3622369114e04318628262cc6ce2ea447cb4c Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | Change-Id: Ia52ba688ea44f88314c5619bfbcf8909a5732876
* | Fix build without features.xlibTasuku Suzuki2017-05-081-2/+2
|/ | | | | | Change-Id: Id0f57aa71a1ec66dc16c9cfa1f31a2e1bdf3b61d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Fix licensingv5.9.0-beta4Jani Heikkinen2017-05-04214-3583/+3144
| | | | | | | | | | Currently tests are licensed under GPL-EXCEPT, examples under BSD and src under LGPL so replase old license headers with new & proper ones. Also remove old & unused license files Task-number: QTBUG-57147 Change-Id: Ia6a738798736c275dc309ccfa5b627dc2178d241 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Don't depend on shell extensionPaul Olav Tvete2017-04-271-39/+40
| | | | | | | The mininimal-cpp compositor example does not have any shell extensions. Change-Id: I925450a75ab6f93245ca9897bbc6f092d93364b6 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Include minimal-cpp example in buildPaul Olav Tvete2017-04-271-1/+1
| | | | | | | | Fix accidental qmake syntax error made when porting to new build system. Change-Id: Icc30712c6992bd953f36f393697614b22f5ab48a Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Remove non-functional examplePaul Olav Tvete2017-04-2717-1229/+1
| | | | | | | | | | The server-buffer example does not work, and probably has not worked for a long time. This example was written for an early version of Wayland, and the APIs have changed since then. Change-Id: If647c7085aaaae87c06010bd28896fa8bfc4bdcc Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Fix documention typoKari Oikarinen2017-04-261-2/+2
| | | | | | | "assiociate" -> "associate" Change-Id: I6562062432c482ec845f758f7b73fce61eefd38c Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Doc: add info about parametersNico Vertriest2017-04-262-6/+6
| | | | | | | | | | qwaylandquickitem.cpp:1076: warning: Undocumented return value qwaylandxdgshellv5.cpp:614: warning: Undocumented parameter 'client' in QWaylandXdgShellV5::ping() qwaylandxdgshellv5.cpp:614: warning: No such parameter 'pong' in QWaylandXdgShellV5::ping() Change-Id: I9d058ba64f75285d1dd0591c2cc21987cabfe4bb Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
View Lorry Controller Status