summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* | Code cleanup (fixing -no-feature-cursor)Paul Olav Tvete2017-03-083-27/+29
| | | | | | | | | | | | | | | | Move QWaylandDisplay member functions into the correct .cpp file. Change-Id: Ie3915d2bd0d191900ad2fd306564bb732e40221a Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | Fix ivi-shell surface id generation limitJens Georg2017-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | The code tries to calculate 2 to the power of 10, but actually calculated 2 XOR 10, limiting the actual number of surfaces possible to use within one application to 8 Change-Id: If16dccaee7aa575c6e0736fb514edb09b4dbee11 Task-number: QTBUG-58934 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* | Remove QRegularExpression dependencyPaul Olav Tvete2017-03-021-1/+3
| | | | | | | | | | | | | | | | | | Fix build error with -no-feature-regularexpression. Change-Id: I6d3d0228548d832abea74b8e1145dc5b09f77b1b Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | Merge remote-tracking branch 'qt/5.8' into 5.9Paul Olav Tvete2017-03-0122-24/+69
|\| | | | | | | Change-Id: I43cd0147a63b5523e3112f09bbfe60e1d6636e6c
| * Initialize the first wl_surface in the constructor of QWaylandWindowJohan Klokkhammer Helsing2017-02-222-1/+8
| | | | | | | | | | | | | | | | | | | | This makes it possible to get a pointer to a wl_surface immediately after platform window creation. Task-number: QTBUG-58423 Change-Id: I2e62380af8b34d05ae31baacc071766493633022 Reviewed-by: Marco Martin <notmart@gmail.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * 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 crash when running without shell integrationGiulio Camuffo2017-02-161-1/+8
| | | | | | | | | | | | Change-Id: Ia480913fd9986cbd306858d1fb497e1fb70551f0 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| * fix typos in "Raspberry Pi"Oswald Buddenhagen2017-02-102-2/+2
| | | | | | | | | | 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>
| * 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-2612-11/+39
| |\ | | | | | | | | | | | | | | | | | | 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>
| | * 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>
* | | Merge dev into 5.9Oswald Buddenhagen2017-02-01158-559/+770
|\ \ \ | | | | | | | | | | | | Change-Id: I560f73aa89f2b833a405861bef510aad8fbd9a07
| * | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-25158-559/+770
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23117-487/+487
| | | | | | | | | | | | | | | | | | | | 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>