summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+29
|\ | | | | | | Change-Id: I324e50a52462ab8188ef91446f15641a95ae0ddf
| * Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-051-0/+29
| | | | | | | | | | Change-Id: If1c56ae9507d8f0ee3c605b32ab2ef75a3c24693 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-123-2/+96
|\ \ | | | | | | | | | Change-Id: I851b9b1bdfaa8be403d69f43b82a3f745038cc1c
| * \ Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-02-023-2/+96
| |\ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: src/compositor/extensions/extensions.pri Change-Id: Ia9a5bd52b7cac9a4f66e7c5deb43d89f0c792325
| | * Add documentation for QWaylandShellSurfaceJohan Klokkhammer Helsing2018-01-262-0/+94
| | | | | | | | | | | | | | | | | | Change-Id: I5948aea1afdd8b9a71e6de128a5203eb9422f5e1 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
| | * Fix incorrect documentation of QWaylandQuickItem::paintEnabledJohan Klokkhammer Helsing2018-01-221-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: Id24b417687843709d9f7df499c4e8c8428f658b6 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | Compositor API: Add support for hardware compositingJohan Klokkhammer Helsing2018-02-0932-9/+1489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Compositor] Add a tech preview for a plugin-based hardware layer API and a VSP2 implementation (for Renesas R-Car M3 and H3). Task-number: QTBUG-64600 Task-number: QTBUG-64604 Change-Id: Ia4abfb6343cf4f006ba408d293ec9464cd6f31b7 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | Fix compilation for Renesas R-Car M3Johan Klokkhammer Helsing2018-02-082-2/+2
| | | | | | | | | | | | | | | Change-Id: Ib85001884bb880a18d8aa1241da0eb614a6b58ba Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | Test that xdg_toplevel_v6s are destroyed before xdg_surface_v6sJohan Klokkhammer Helsing2018-02-011-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an assert so tst_WaylandClientXdgShellV6::createDestroyWindow verifies deletion order. Task-number: QTBUG-65568 Change-Id: I0b4dd350f811495a9c7a78811915647fb713a43a Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | | Merge remote-tracking branch 'qt/5.10' into devPaul Olav Tvete2018-01-3125-104/+323
|\ \ \ | |/ / | | | | | | Change-Id: I603cbb164e6015c1bb7796bd8bb055d84dbc3b04
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-186-2/+78
| |\ \ | | |/ | | | | | | Change-Id: I6c201769561f53d88c89f75cce7d9a7b2643d2f6
| | * Fix requestUpdate()Paul Olav Tvete2018-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit 3e745ea053e42ba087438203df3bd76b30a08eb2, mFrameCallback is set to null when the next buffer is attached, not when the callback arrives. This means that a requestUpdate() after the frame callback would never be delivered. The solution is to test mWaitingForFrameSync instead. There is still a small race condition, but the failure case is that the update will arrive after 5 ms instead of exactly at frame sync. Change-Id: I413ed2b76c8527f825e501077bab712146b6705f Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-185-4/+43
| | |\ | | | | | | | | | | | | Change-Id: If72cba3251b792028a51f815f2f0cb064779bcec
| | | * Fix static builds with libwayland-eglv5.9.45.9.4Johan Klokkhammer Helsing2018-01-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a naming conflict between the client buffer integration, wayland-egl, and the system library libwayland-egl.so Rename the plugin binary to qt-plugin-wayland-egl to avoid the issue. Task-number: QTBUG-65652 Change-Id: Ib074c25e269a5e11b087fb4c3ddb15fef7d4a7ee Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | | * Fix protocol error when destroying xdg surfaces (v6)Johan Klokkhammer Helsing2018-01-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroy role object for toplevels when destroying the xdg surface. Task-number: QTBUG-65568 Change-Id: Ibe027c3eef8160f9fd2cfb05971c92ceb155f95b Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| | | * Add changes file for Qt 5.9.4Paul Olav Tvete2018-01-051-0/+35
| | | | | | | | | | | | | | | | | | | | Change-Id: I97a769b49357e9b92c9160bf8ba4bfdb51009af3 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | | * Revert "Ref count buffer usage"Johan Klokkhammer Helsing2018-01-052-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. Backport from 5.10.0 to 5.9.4 Task-number: QTBUG-64631 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 2767d0533f2901517c87d9c99bcda26564484280) Change-Id: I2acf5574a1b792d3bbf928fb0bc328aa8ee8ffe0 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | * | Don't recreate hidden egl surfacesDavid Edmundson2018-01-162-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWaylandEglWindow deletes surfaces when a window changes from hidden to visible, presumably as a result of us not having a valid wl_surface object. By extension it doesn't make sense to create a surface whilst a window is still hidden. This fixes a crash where a QQuickWindow hides and then is destroyed. In QQuickWindow destruction we have to create a valid context in order to delete any textures/assets owned by the scene graph; as the wl_surface has gone this causes an error in the EGL libs when we create an EGL surface. Task-number: QTBUG-65553 Change-Id: I9b37a86326bf2cd7737c4e839c1aa8c74cf08116 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-0716-97/+145
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/compositor/compositor_api/qwaylandquickitem.cpp Change-Id: Id2f49e8703a67daedcee66db83f006df828d9da0
| | * | Client tests: Support testing with window decorations enabledJohan Klokkhammer Helsing2018-01-052-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously tests would hang because eglInitialize (which was called on window decoration creation) would wait for a Wayland roundtrip while our compositor thread was waiting for more commands. Work around this by prematurely causing the clientBufferIntegration to be initialized before applicationInitialized (when the compositors switches to handling requests synchronously). Change-Id: I793c70a8f3a764cb3a70f00ddcab76cd4044b442 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| | * | Client tests: Fix wrong position being sent when mocking touch eventsJohan Klokkhammer Helsing2018-01-041-2/+6
| | |/ | | | | | | | | | | | | | | | | | | We were sending ints when we should have been sending wl_fixed_ts. Change-Id: I9f074334cb3ea8a3d61789ff641c2d022a5989b7 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| | * Fix for big memory leak in Qt based compositorsRobert Griebl2017-12-192-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | The system would leak a complete buffer every time the client attached a new Wayland buffer. For QML applications this will normally happen every time a new animation is started. Change-Id: Ie4981ccbb2e09d702ee291f1144e3b8aa84c0d1d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: Iba1f792012731f8cddfdc5d5dae8fe2b0b2eef7a
| | * Fix broken documentationJohan Klokkhammer Helsing2017-12-056-59/+40
| | | | | | | | | | | | | | | Change-Id: I16f11c32c861908e34de0cb28c8ad51378aa6e61 Reviewed-by: Martin Smith <martin.smith@qt.io>
| | * wayland-egl: use egl compiler optionsSamuli Piippo2017-12-041-1/+1
| | | | | | | | | | | | | | | Change-Id: I6f8dcadf3cffecc6097ad0ad5e8245831b3ce0c1 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * Fix decoding of multi-planar surfaces (YUV video)Paul Olav Tvete2017-11-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLTexture::bind() expects texture unit number as plain uint number (e.g. 0,1,2) and not as GLenum (GL_TEXTURE1) Task-number: QTBUG-64841 Change-Id: Id471fc9976677ac8a358f04b9ae09c6a32beef63 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | * Fix various documentation errors for QML methods and signalsJohan Klokkhammer Helsing2017-11-237-15/+15
| | | | | | | | | | | | | | | Change-Id: I9461fae92ec3d41e4f9e866a6a4fa7554a309ecd Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| | * Add documentation for QWaylandQuickItem::surfaceDestroyedJohan Klokkhammer Helsing2017-11-231-0/+26
| | | | | | | | | | | | | | | | | | Change-Id: I7fd1e44974857b77fea27e75ef791603e607642e Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+52
| | |\ | | | | | | | | | | | | Change-Id: Ibedf640006695f88bd6fe9d2a5adb7b32a72f733
| | * | fix build without xkbcommon-evdevRaphael Freudiger2017-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a223b440a6678aebc04df49f62fedc382bd898b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I8948d995f6d84751a9abb19b203b1ccd8be50777
| * | | Fix crash when opening a window with a hidden parentAleix Pol2017-12-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a transient parent but it doesn't have a shell surface. We need to make sure that it exists before setting the transient parent's shell surface as the parent to the window. Change-Id: I918b2f14074217638529ba73530f0102f7438079 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-084-4/+97
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Id64ad5564f3cd85829ede15ebf33db13cd1587fa
| | * \ \ 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.05.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.35.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
| | * | 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>
* | | | Compositor examples: Remove unused dependencies on private APIsJohan Klokkhammer Helsing2018-01-162-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Iee33e9fe065693a615e1d18d3d03d5a7618e3f75 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | | | QWaylandWindow: Fix incorrect namespace orderJohan Klokkhammer Helsing2018-01-161-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I741d3fb392c6121f2d8514ee2504fc88f99092ff Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | | | Doc: Add documentation dependency to Qt CoreTopi Reinio2018-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc generates the following note for a number of functions: 'Note: This function can be invoked via the meta-object system and from QML. See Q_INVOKABLE.' Q_INVOKABLE is meant to be a link which fails without Qt Core. Change-Id: Id67120e37992c671c954b04309e9fd253bf184e1 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | | Adapt to qtbase 5.10 API change: qssize_t -> qsizetypeLiang Qi2018-01-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65600 Done-with: Thiago Macieira <thiago.macieira@intel.com> Change-Id: I34116dad8eecd01090596270965b9a24f6fe8f39 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Client: Don't leak the last Wayland sync callbackJohan Klokkhammer Helsing2017-12-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QWaylandDisplay is deleted while waiting for a sync callback, don't leak the callback. Change-Id: I4fd46cdc8c431e44998d70d1afc01018c4908f27 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | | | Simplify and modernize QWaylandInputDeviceJohan Klokkhammer Helsing2017-12-052-67/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use enum values and nullptr instead of using magic ints directly. Also get rid of ifdefs in constructors by using in-class member initializers. Change-Id: I037bec7070296a4a8cb46ebe85104caf5a08fb77 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | | | Fix outdated FDL license headerLiang Qi2017-12-051-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie664c28c21880af15452f091a977a5bedec3d73a Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | | Remove QWaylandExtendedSurface* from the private compositor APIJohan Klokkhammer Helsing2017-12-046-362/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes QWaylandExtendedSurface, QWaylandSurfaceExtensionGlobal. The only code touching these classes was QWaylandQuickSurface::setClientRenderingEnabled(), but that code was only useful if QWaylandSurfaceExtensionGlobal had already been instantiated. The extension is a remnant from the past, and since no examples or tests are using the extension, it's safe to remove it. Change-Id: Ife202cb035c836b73a7c03985f5bf3be0abebc3d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | | Implement basic key composition supportGiulio Camuffo2017-12-042-1/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use xkbcommon-compose to handle basic compose key support. We should expand on it in the future to handle things like resetting the compose state on text field switching. Task-number: QTBUG-54792 Task-number: QTBUG-64572 Change-Id: I9d1d5ca4c9991928e12979f69eaa477e0cb28ada Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | | Port away from QRegion::rects()Marc Mutz2017-12-042-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use begin()/end() instead. Change-Id: I1a73b4518ee7408271ec913a219c034e330b0d5a Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | | | ivi: Try the ivi-shell as shell integration as wellHolger Hans Peter Freyther2017-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the IviApplication in a compositor and launching a Qt Client it will fail to initialize a shell. This is because QtWaylandClient::QWaylandIntegration::initializeShellIntegration will only try some shells by default. Add the ivi-application to make it work out of the box. Add it last to have XDG and WL shell take preference and avoid loading the libivi-shell.so. Change-Id: I5c97c65d81434cba59cf9cb5bbe4b6fd8ccf4757 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
View Lorry Controller Status