summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * compositor: Export QWaylandQuickShellIntegrationPier Luigi Fiorini2017-02-071-1/+1
| | | | | | | | | | | | | | | | Allows third parties to make QtQuick shell integrations. Task-number: QTBUG-58579 Change-Id: I252ea27722526371c948d2b0079adf157627caf0 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * Deduplicate xcomposite-egl and xcomposite-glx plugin class namePier Luigi Fiorini2017-01-314-6/+6
| | | | | | | | | | | | | | | | | | | | In 85a78f88 was set a wrong PLUGIN_CLASS_NAME for xcomposite-egl and xcomposite-glx client integration plugins that collides with the one for the compositor counterpart. Task-number: QTBUG-58491 Change-Id: I23d141adf988942ac8c4c55f421cf763c0e4faff Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-2613-11/+123
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h Change-Id: Ie45a13d3c866d0503e6e31b2a53b70f3420c5066
| | * compositor: Add QWaylandXdgPopupV5 position property notifyv5.8.0Pier Luigi Fiorini2017-01-092-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The property changes at initialization time hence it needs to notify changes. Change-Id: I5f6bc51da69abce387ac31cecfff4c7362501eb0 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@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>
| | * Don't call wl_surface::destroy if the surface was never initializedJohan Klokkhammer Helsing2017-01-051-1/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-57757 Change-Id: I85b74a3445c8d9df1a89b16760ce57e45204d2c6 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * Fix crash when starting clientsJohan Klokkhammer Helsing2017-01-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send wl_surface::set_input_region requests before the wl_surface has been initialized. The shapedclock example used to crash in wl_proxy_marshal prior to this fix. Task-number: QTBUG-57757 Change-Id: I0a459d374bfb88fb22d048eda3722a41112d67a4 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * Register XdgPopupV5 typePier Luigi Fiorini2017-01-031-0/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-57869 Change-Id: I7a38a5d4360aa470cb4c05375225c025804f8297 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * Fix build for brcm graphicsv5.8.0-rc1Johan Klokkhammer Helsing2016-12-081-1/+1
| | | | | | | | | | | | | | | Change-Id: I301487ad58181a739146139862fe66fec432da9a Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * Add changes file for 5.8.0Paul Olav Tvete2016-12-071-0/+84
| | | | | | | | | | | | | | | Change-Id: Ibea1e96ef239f60ab7e6010c7c332c8c0e7d0f37 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | * Unify getProcAddress behavior in xcomposite-glxLaszlo Agocs2016-12-062-2/+9
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-57326 Change-Id: I6e49cce16a3bcda0de2f1a9c9ce97acb0a27c4da Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Unify getProcAddress behavior in the brcm backendLaszlo Agocs2016-12-063-3/+10
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-57326 Change-Id: Ie3df866507e591b47e0e65a1867313b0ab388635 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Fix crashing in non-core GLES functions on some systemsLaszlo Agocs2016-11-291-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 5.7 refactoring for QOpenGLFunctions introduced new requirements for the QPlatformGLContext::getProcAddress implementations. Implementations outside of qtbase were unfortunately forgotten. QtWayland's implementation does not derive from the common EGL version so it needs its own patch. Task-number: QTBUG-57326 Change-Id: Ie2ad22bf5986870aac74adc1e4c654c616091034 Reviewed-by: Risto Avila <risto.avila@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Disable building of QtWayland if QtGui is missingPaul Olav Tvete2017-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: I85a08199453c33e0eea641e5914b771def8032b2 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Update examples to account for Window.targetScreen renamev5.9.0-alpha1Tor Arne Vestbø2017-02-113-6/+6
| | | | | | | | | | | | | | | Change-Id: I97af04c43a5966472eb195779ffd730b7459aa37 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | Merge dev into 5.9Oswald Buddenhagen2017-02-01181-629/+1076
|\ \ \ | | | | | | | | | | | | Change-Id: I560f73aa89f2b833a405861bef510aad8fbd9a07
| * | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-25181-629/+1076
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/wayland/custom-extension/client-common/main.cpp src/client/qwaylandwlshellintegration_p.h src/client/qwaylandxdgshellintegration_p.h src/compositor/compositor_api/qwaylandquickoutput.h src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h Change-Id: Ic78c610ddf102b0a185294f625bbfcb9238b0f3c
| | * | Replace all occurrences of Q_DECL_OVERRIDE with overrideJohan Klokkhammer Helsing2017-01-23135-539/+539
| | | | | | | | | | | | | | | | | | | | Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * | load(qt_plugin) at the endOswald Buddenhagen2017-01-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | amends 5b3f207ed after the addition of the ivi-shell in f144f0f71. Change-Id: I35c3974ed5f257d83280e4dc3421e4a2a57303d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * | eglstream: Return if we don't have a OpenGL contextDominik Holland2017-01-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having an warning message should be enough, no need to still try to bind the texture and end in an assert. Change-Id: I6a5f297e1d2b01ca3649775be53ac28d7dcc6479 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * | compositor: Set windowType property for QWaylandXdgSurfaceV5Pier Luigi Fiorini2017-01-193-12/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWaylandShellSurface has a windowType property, set that instead of keeping the window type as an internal detail. QWaylandXdgSurfaceV5 now behaves like QWaylandWlShellSurface. [ChangeLog][Compositor] QWaylandXdgSurfaceV5 now sets the windowType property and behaves like other shell surface implementations. Change-Id: Iffd91adaff7a2caab3c15b56b839ae2251cf8324 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | * | Fix build with -no-openglJohan Klokkhammer Helsing2017-01-192-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I8340a4d2efe4f3d4a9bd5aaedda6db1b55009951 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * | Fix build without feature.draganddropTasuku Suzuki2017-01-152-6/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: I4fff1a8d48483298eebecdc751fe76e80444bd99 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | Fix build without feature.cursorTasuku Suzuki2017-01-1310-3/+77
| | | | | | | | | | | | | | | | | | | | Change-Id: If244e7ac58133ae6fbefacfa243d47fa210140be Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | Fix build without feature.imTasuku Suzuki2017-01-137-12/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie29b87a4198cbe34df6746b10c7a17ee1fcd608d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | Fix build without feature.wheeleventTasuku Suzuki2017-01-132-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib78093b75f99a5b7b2589722f4706b75c2431c74 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | Fix build without feature.clipboardTasuku Suzuki2017-01-135-6/+27
| | | | | | | | | | | | | | | | | | | | Change-Id: I195efecca9350cb519865f251cdee9c6e23d3592 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | Send touch cancel event when QWaylandQuickItem::visible is set to falseJohan Klokkhammer Helsing2017-01-123-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-57927 Change-Id: I8b6a5aaa9337222286382ffbeee13b794bec125c Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Register QWaylandXdgShellV5 as uncreatable typePier Luigi Fiorini2017-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessing the shell property of QWaylandXdgSurfaceV5 results in an error because QWaylandXdgShellV5 is not registered. Change-Id: I72504508b860c720d26057c0da21d303345ace41 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | | | | | Change-Id: I776d579beb421727169b335a00513c0a286ae9ce
| | * | Client: Don't crash when the receiver of a paste closes the pipeJohan Klokkhammer Helsing2017-01-031-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore the SIGPIPE signal Task-number: QTBUG-57202 Change-Id: If22381f446675836aeb741a8e6da5473b0a27301 Reviewed-by: Martin Gräßlin <mgraesslin@kde.org> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * | Add animations to the C++ examplePaul Olav Tvete2017-01-023-19/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Show how to use setBufferLocked() from C++. Change-Id: I43be7dcf8f44fd80dd0d4977e38a0d8ff3339432 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | * | Set PLUGIN_CLASS_NAME in .pro filesPaul Olav Tvete2017-01-0227-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes static linking and cmake config file generation. In some cases, the class was renamed for disambiguation or just uniformity. Task-number: QTBUG-51248 Change-Id: Ibdce2e1b6a52312f84301c426632e94deeb567bd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| | * | Fix nullptr crash introduced in 4e7af89Robert Griebl2016-12-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This occurred with any system-ui using the qtapplicationmanager when trying to show the first window of an application. Change-Id: Ifec4626269f30f91cd0f4e29871d33747d9b2374 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
| | * | Fix initial window property values being propagatedRobert Griebl2016-12-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken since the the shell-surface refactoring. Change-Id: I130b7396e85c570a9d11d609af6b3016e3f706f0 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * | Add support for running compositors with custom device pixel ratioJohan Klokkhammer Helsing2016-12-169-12/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add a manual test for showing that it works with different scale factors as well. Task-number: QTBUG-55303 Change-Id: Ib842ea51cfb62a2d46713e95d56b8a9da445d14d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
* | | | Fix namespaced buildsJohan Klokkhammer Helsing2017-01-312-5/+6
|/ / / | | | | | | | | | | | | | | | | | | Change-Id: I07e6aab0f2379c4bbcde8b8d1d2dc1b581f9987a Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | Remove unused files from examplePaul Olav Tvete2017-01-023-103/+0
| | | | | | | | | | | | | | | Change-Id: I8ce9c4b284da2d3e7f88e8449be22f9a25b5a2e0 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | | Fix pointless asserts in compositor testsJohan Klokkhammer Helsing2016-12-231-6/+6
| | | | | | | | | | | | | | | | | | Change-Id: Ie5528c988a15d130056f1d2a3b3e858d78897ba5 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | | Handle the zxdg_toplevel_v6.close eventJohan Klokkhammer Helsing2016-12-131-0/+1
| | | | | | | | | | | | | | | Change-Id: I9f470930e8d3d88430f8a7b2017fa2d0159a015e Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-129-5/+68
|\| | | | | | | | | | | Change-Id: Idd91b55bc2b1e3506d9385b3352aeda06de6d4bc
| * | Fix potential undefined behaviorJohan Klokkhammer Helsing2016-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | Don't leave QWaylandXdgSurfaceV5Private::m_xdgShell uninitialized. Change-Id: Ib18ebf29d3dbae020f5d48f4c81c01ed2f1c473e Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * | Doc: Mention files for different wayland protocolsKai Koehne2016-12-061-0/+4
| | | | | | | | | | | | | | | Change-Id: If7de71930a8339ff8b36e74331810b186e1ebd32 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | Don't delete the paint node for QWaylandQuickItems with locked buffersJohan Klokkhammer Helsing2016-11-301-2/+5
| |/ | | | | | | | | | | | | | | This fixes an issue where surfaces would sometimes disappear even though bufferLocked had been set. Change-Id: I01f8d879e166d9844671c51e01ecb3141b174d76 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Make qwindow-compositor look different than pure-qmlPaul Olav Tvete2016-11-291-1/+2
| | | | | | | | | | Change-Id: I8aac99dd98be943909f5a6dc254a4f79e83e61d9 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Don't crash when trying to run on a compositor without outputsJohan Klokkhammer Helsing2016-11-281-0/+5
| | | | | | | | | | | | Change-Id: I164ad71f42dff1ad92576729040608016497a56a Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-262-0/+50
| |\ | | | | | | | | | Change-Id: Ida15dd3247ae5690685fc66005cbebe58fca5d10
| | * Merge remote-tracking branch 'origin/5.7.1' into 5.75.7Liang Qi2016-11-242-0/+50
| | |\ | | | | | | | | | | | | Change-Id: I3aaa6641fb0b941d1fcadd796fb43edf15f34be9
| | | * Add changes file for 5.7.1v5.7.1Jani Heikkinen2016-10-281-0/+49
| | | | | | | | | | | | | | | | | | | | Change-Id: I04f2b68c41c5a0946707956d2efbc4384797b807 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| | | * Client: Remove windows from keyboard focus list when destroyedJohan Klokkhammer Helsing2016-10-253-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the undefined behavior in tst_WaylandClient::touchDrag and mouseDrag Note: The test still fails if run twice in a row, but it appears to be deterministic. Task-number: QTBUG-56187 Change-Id: Ib45d82224f004d1324f2ce4d6b7df05ee36c04f5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 0049240a2b7d8691f09224e1542919ddbbb0d864) Reviewed-by: Johan Helsing <johan.helsing@qt.io>