summaryrefslogtreecommitdiffstats
path: root/src/compositor
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Disable the GCC warning about missing initializersThiago Macieira2017-06-221-0/+2
| | | | | | | | | 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-222-4/+4
| | | | | | | | | 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>
* 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 licensingv5.9.0-beta4Jani Heikkinen2017-05-04127-1546/+1927
| | | | | | | | | | 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>
* 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>
* Fix nullptr dereference in QWaylandSeat::setKeyboardFocusJohan Klokkhammer Helsing2017-04-251-1/+1
| | | | | | Task-number: QTBUG-60251 Change-Id: I82da2226640154d2384a9894c1f3ca46181b80d3 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* Add missing documentation for XdgShellV5v5.9.0-beta3Johan Klokkhammer Helsing2017-04-211-0/+64
| | | | | | Change-Id: I96fa1d37b42bfc2cc0a10aafbc2021a8d5b8fd16 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-187-1/+34
|\ | | | | | | Change-Id: I436178527be54fd0efa6ffbe39918740d4737478
| * Fix crash when assigning nullptr to ShellSurfaceItem.shellSurfaceJohan Klokkhammer Helsing2017-03-237-1/+34
| | | | | | | | | | | | | | | | | | This also fixes a memory leak when switching shellSurfaces. Task-number: QTBUG-59591 Change-Id: I196ea7238d9139c8ac281f82bbae8dd066b1fcd7 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Andreas Cord-Landwehr <cordlandwehr@kde.org>
* | Doc: Add info about return valueNico Vertriest2017-04-181-0/+2
| | | | | | | | | | | | | | | | | | qwaylandseat.cpp:375: warning: Undocumented return value Change-Id: Id26f64afa213d01786beac659c042b54b2b41215 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | Fix warning about inconsistent use of override keywordv5.9.0-beta2Thiago Macieira2017-04-041-1/+1
| | | | | | | | | | | | | | | | | | qwaylandshmbackingstore_p.h:93:19: warning: 'paintDevice' overrides a member function but is not marked 'override' [-Winconsistent-missing- override Change-Id: I27b55fdf514247549455fffd14b1791d4dd6b6b3 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Fix clang warning about struct/class mismatchThiago Macieira2017-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | They're the same, so GCC doesn't complain. But MSVC actually mangles them differently, so Clang has a warning. qwaylandivisurface.h:42:1: warning: class 'wl_resource' was previously declared as a struct [-Wmismatched-tags] Change-Id: I27b55fdf514247549455fffd14b179868d300c66 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Don't redefine symbols from system librariesPaul Olav Tvete2017-03-281-1/+1
| | | | | | | | | | | | | | | | The system library versions may contain driver-specific functionality. Change-Id: Iaaa71bff7d2c305cb47798920a5977aaa2a3ac8a Task-number: QTBUG-58299 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Clean up draganddrop and clipboard featuresPaul Olav Tvete2017-03-2318-30/+131
| | | | | | | | | | | | | | | | | | | | | | | | Don't assume that no-draganddrop implies no-clipboard. Introduce a new private feature wayland-datadevice which contains the common functionality. This feature cannot be controlled independently, but is automatically disabled when both clipboard and draganddrop are disabled. Change-Id: I6aac09c7ee524e3b11f0a1caa4a6c62fc3f1d10f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Paul Olav Tvete2017-03-131-0/+8
|\| | | | | | | Change-Id: I76be82a6da77f51f6d53239d593dc6f61951559b
| * Fix build when xkbcommon is disabledGiulio Camuffo2017-03-081-0/+8
| | | | | | | | | | | | | | | | Change-Id: I0ec7a5aa8300e796b015c0d995e71ebf77727bbd Task-number: QTBUG-58839 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Yong Bakos <junk@humanoriented.com> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Doc: completed undocumented itemsNico Vertriest2017-03-132-3/+4
| | | | | | | | | | | | | | | | qwaylandseat.cpp:153: warning: Undocumented enum item 'DefaultCapabilities' qwaylandxdgshellv5.cpp:1089: warning: Undocumented parameter 'position' Change-Id: I962c073e016965bc9378f101aca38cd86a7a8047 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Merge remote-tracking branch 'qt/5.8' into 5.9Paul Olav Tvete2017-03-015-5/+10
|\| | | | | | | Change-Id: I43cd0147a63b5523e3112f09bbfe60e1d6636e6c
| * Don't try to send touch cancel events to null surfacesJohan Klokkhammer Helsing2017-02-201-2/+5
| | | | | | | | | | | | | | | | Previously, when closing a surface by touch, the touch ungrab event would cause a null dereference. Change-Id: Icbb11c8bc096fef1e5cfd563d3657a39a14a5b5b Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * fix typos in "Raspberry Pi"Oswald Buddenhagen2017-02-101-1/+1
| | | | | | | | | | Change-Id: I92938ad834999ceabe0b360ab733a2c54335004c Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * fix namespaced build - yet againOswald Buddenhagen2017-02-072-5/+6
| | | | | | | | | | | | Change-Id: Ie68c4318237c44c81e6bd4b3e792f2af7bd52675 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * 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>
| * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-262-1/+3
| |\ | | | | | | | | | | | | | | | | | | 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>
* | | Merge dev into 5.9Oswald Buddenhagen2017-02-0155-199/+276
|\ \ \ | | | | | | | | | | | | Change-Id: I560f73aa89f2b833a405861bef510aad8fbd9a07
| * | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-2555-199/+276
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2344-160/+160
| | | | | | | | | | | | | | | | | | | | Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1 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-151-2/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I4fff1a8d48483298eebecdc751fe76e80444bd99 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>
| | * | 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>
| | * | 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>
| | * | Add support for running compositors with custom device pixel ratioJohan Klokkhammer Helsing2016-12-165-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-124-4/+7
|\| | | | | | | | | | | 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>
| * | 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>
| * Fix crash on client exit with popupPaul Olav Tvete2016-11-251-1/+1
| | | | | | | | | | Change-Id: Ideb7a07dbeae5829334a8d8ce685c6bbdfd495d2 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Doc: Drop the dummy "Tech. Preview" node from the navigation breadcrumbVenugopal Shivashankar2016-11-241-1/+0
| | | | | | | | | | | | | | Qt Wayland Compositor is a fully supported add-on module now. Change-Id: Icd742e019be4b516227f9e4a976dcd87014e3251 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Try to find compositor among parents for QWaylandQuickOutputJohan Klokkhammer Helsing2016-12-062-1/+20
|/ | | | | | | And simplify the minimal-qml and ivi-compositor examples Change-Id: Ic445349c9d7845813b6700414464a688aac40e73 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Use new feature system, part 2Lars Knoll2016-11-236-19/+20
| | | | | | | | | Convert all uses of QT_NO_FOO to proper QT_CONFIG(foo) checks. Change-Id: Id0f0b3325c246567a43d6b2d71b0d69e5535e648 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Use the feature system internallyLars Knoll2016-11-2342-132/+199
| | | | | | | | | Get rid of almost all DEFINES += ... in the pro files, instead use the proper QT_CONFIG() macro to determine whether a feature is available. Change-Id: I867769be2085c6ba93b6815e223e2b89edcb245d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Move qtwayland over to use the new configuration systemLars Knoll2016-11-234-14/+104
| | | | | | | | | | | | | Re-use configuration results from qtbase where possible and move all pkg-config handling over to be done at configuration time. Since waylandclient and waylandcompositor are two independent libs, this required some duplication of features and libraries used by both in the configure.json files. Change-Id: I1f3ec56c85cb780324cc7634a3ad7951125853a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Only send mouse move event when mouse movesPaul Olav Tvete2016-11-222-1/+8
| | | | | | | | | Qt Quick recently changed to send hover events 60 times per second even if the mouse doesn't move. Make sure we only send mouse move events over the Wayland protocol if the mouse actually moved. Change-Id: Ic196512dde1718de461eb2c64cec2e95e220ce89 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Don't crash when surface is destroyedPaul Olav Tvete2016-11-175-16/+17
| | | | | Change-Id: I082c3bb0003265c625d165e1463951842a730c11 Reviewed-by: Johan Helsing <johan.helsing@qt.io>