summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | Use nullptr instead of 0 in qtwaylandscannerJohan Klokkhammer Helsing2017-08-151-16/+16
| | | | | | | | | | Change-Id: I5ffee26a4c0cd7726e007cc0692e403e15b5726e Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | Update server buffer integrationPaul Olav Tvete2017-08-1510-87/+160
| | | | | | | | | | | | | | | | | | Fix crashes, and change the (private) API to be more usable. The libhybris code compiles without warnings, but is untested. Change-Id: I1433daf1ba76d7869d1dfe260642199ce5a1b849 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Remove extra semicolonFrederik Gladhorn2017-08-111-1/+1
| | | | | | | | | | Change-Id: I3941d7e8caffb613f546e628c7e089e971d1e8b8 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | QWaylandShmBuffer: use QTemporaryFileThiago Macieira2017-07-311-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using mkstemp. Even current glibc versions do not open the file with O_CLOEXEC, so this code is not thread-safe. QTemporaryFile is. And since Qt 5.10, it will also use O_TMPFILE on Linux, so the file will not actually exists on disk. Take this opportunity to use the runtime directory instead of /tmp. There's no guarantee that the /tmp filesystem can support mmap'ing, while XDG_RUNTIME_DIR has that guarantee. It's also usually a tmpfs, so no data will be leaked to disk. Change-Id: I8d96dea9955d4c749b99fffd14cd5335d1114cef Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Compositor: Add support for xdg-shell-unstable-v6Johan Klokkhammer Helsing2017-07-217-0/+2703
| | | | | | | | | | | | | | | | | | | | This adds QML and C++ support for xdg-shell-unstable v6 on the compositor side. A couple of things are still missing for complete support, but can be added implemented later without breaking the API. Task-number: QTBUG-56174 Change-Id: I08d7c05aa4f40f00377d92f2519d89ab416daaf4 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Remove fallthrough warningsThiago Macieira2017-07-111-0/+2
| | | | | | | | | | | | | | | | Found by GCC 7: qwaylandquickitem.cpp:223:9: warning: this statement may fall through [-Wimplicit-fallthrough=] Change-Id: I8d96dea9955d4c749b99fffd14cd5157a79d782b Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Merge remote-tracking branch 'qt/5.9' into devPaul Olav Tvete2017-06-2718-20/+60
|\| | | | | | | Change-Id: I286b58e2c3a42c1078fd25d5b699c8a17edb1c23
| * 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>
* | Send SurfaceCreated and SurfaceAboutToBeDestroyed events for wl_surfaceJohan Klokkhammer Helsing2017-06-092-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the events were matching the life cycle of QWaylandWindow. This commit changes it so the events are matching the life cycle of wl_surfaces instead (a QWaylandWindow can outlive several wl_surfaces). Some of these events were already sent in QWindowPrivate (the first and last). Now we handle the cases where the wl_surface is destroyed and recreated due to hiding/showing the window or when changing the role of the wl_surface. Task-number: QTBUG-58423 Change-Id: Ie4a4e7dd529e1a41a2cf42e02cebb3c8aca4a4cc Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Marco Martin <notmart@gmail.com>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-07176-2151/+2784
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf src/client/qwaylandwindow.cpp Change-Id: I3ae070ff20df4b858a4eef769438092c061e47ef
| * 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>
| * 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-04170-2091/+2649
| | | | | | | | | | | | | | | | | | | | 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>
| * 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>
* | Remove duplicate codeRobert Griebl2017-05-152-24/+0
| | | | | | | | | | | | | | | | This code started as a 1:1 copy from the base class in 5.8. Just call the base class implementation, since this was also improved in the meantime. Change-Id: Ib9c7c6efa3f043a83029b5387097533bf5da833e Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-2178-173/+415
|\| | | | | | | Change-Id: I7285dfeaac0d7963607930904aa017bedb1e48ab
| * Don't try to create zxdg_popup_v6s with incomplete positionersJohan Klokkhammer Helsing2017-04-191-0/+1
| | | | | | | | | | | | | | | | | | | | A positioner without a size is considered incomplete, and creating a popup with an incomplete positioner is a protocol error. Change-Id: I5efdba0edfe6edc5f7b0a4908c1e43b93d35eea8 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-1811-12/+39
| |\ | | | | | | | | | Change-Id: I436178527be54fd0efa6ffbe39918740d4737478
| | * switch to new way to refer to libdl5.8Oswald Buddenhagen2017-04-062-6/+2
| | | | | | | | | | | | | | | Change-Id: I9269bb0902b0a5b5d8581d79fa9568122ee0641b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Doc: Fix external links to wayland-ivi projectKai Koehne2017-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Seems that the project moved to github. Task-number: QTBUG-59656 Change-Id: Ib6c9c62e987f11ffbcffe013cbeb4a4454e594b0 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| | * 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>
| | * Fix brcm-egl build by correcting commit() usageDonald Carr2017-03-181-3/+1
| | | | | | | | | | | | | | | | | | | | | Adjusted existing call to commit() in keeping with parallel changes in 5b807802 Change-Id: I31c17336efa9a79a5f6c1719702215db7239a97d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | 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-046-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 warning about unused variableThiago Macieira2017-04-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | QPoint has no side-effects so it's safe to remove. main.cpp:214:12: warning: unused variable 'gradCenter' [-Wunused-variable] Change-Id: I27b55fdf514247549455fffd14b179b3a6a08617 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>
| * | Fix Clang warning about unused private fieldsThiago Macieira2017-04-042-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | qwaylandxcompositeeglwindow.h:69:35: warning: private field 'm_context' is not used [-Wunused-private-field] qwaylandxcompositeeglwindow.h:75:21: warning: private field 'mBuffer' is not used [-Wunused-private-field] Change-Id: I27b55fdf514247549455fffd14b179d94a725b7f Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * | Fix build without QtQuickv5.9.0-beta1Tasuku Suzuki2017-03-301-1/+1
| | | | | | | | | | | | | | | Change-Id: I13d72f83cbb53d72ad602df43abf1a2779f96e5b Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * | Fix the wayland-egl compositing using NVIDIA graphicsDominik Holland2017-03-281-7/+19
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-58299 Change-Id: I29737c62dc977de9b7301b635454315560ebb338 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * | Don't redefine symbols from system librariesPaul Olav Tvete2017-03-282-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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-2336-87/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-133-0/+33
| |\| | | | | | | | | | Change-Id: I76be82a6da77f51f6d53239d593dc6f61951559b
| | * Fix build when xkbcommon is disabledGiulio Camuffo2017-03-083-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | 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>