summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* added a changes for 5.5.0v5.5.0-rc1v5.5.0Jørgen Lind2015-06-151-0/+33
| | | | | Change-Id: Ia8a927c5bcfb45bc7a8c16d1c8ff75487fe71cdd Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* Fix that we pick up the generated headers in source packagesJørgen Lind2015-05-291-0/+2
| | | | | Change-Id: If5ae8749ccbddfc878ae4e0adaa40f072527d425 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix crash when the wl_shm global comes after a wl_output oneGiulio Camuffo2015-05-283-1/+8
| | | | | | | Task-number: QTBUG-44503 Change-Id: I6932df57bb4560b6dceb72a5cb7c536cd090e92a Reviewed-by: Martin Gräßlin <mgraesslin@kde.org> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-05-250-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iafa184859c6610a39f4251e6ca59d0863eed3ae0
| * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | Change-Id: I55a870542290b49267613427bbc8cb68ca4dd7fb
* | Fix the build error in public headersBhushan Shah2015-05-172-3/+3
| | | | | | | | | | | | | | One should always use Q_SLOTS/Q_SIGNALS in then public headers Change-Id: Ibbba0d3ff402bd320049bcd58ced07ad1342ef3b Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Add safety check in QWaylandInputDevice::Keyboard::modifiers()Martin Gräßlin2015-05-151-0/+3
| | | | | | | | | | | | | | | | ::modifiers() might be invoked before being initialised. E.g. when a pointer button event is emitted before the keymap is sent. Change-Id: Ib95f9866d808b2a32ddfaa0862cdb3226fab1938 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Fix threaded OpenGL rendering on Mesa and possibly other EGLsGiulio Camuffo2015-05-143-4/+14
| | | | | | | | | | | | | | | | | | eglBindAPI's docs says "defines the current rendering API for EGL in the thread it is called from". We were instead just calling it in the thread the context was created in, not in the thread used for rendering. Change-Id: Iba8ffe75a6f4f8b9d1bba59c0e7cce34499e9c48 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Reset wayland object pointer after destroyArnaud Vrac2015-05-071-0/+4
| | | | | | | | | | | | | | This allows calling init() on the wayland object again after destroy() Change-Id: I7856cc8ec676eee7575e15a5d1f81cf1b89537c8 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Track last input window with a QPointer in case it is destroyedArnaud Vrac2015-05-072-2/+8
| | | | | | | | | | Change-Id: I61d7aa4b6a37922eb3beefd983154ee267cae0ef Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Map more XKB key codesArnaud Vrac2015-05-071-0/+17
| | | | | | | | | | Change-Id: I0a2b56043235666bc57b46ae4ac78ca5e24e736d Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Fix crash on keyboard removeGiulio Camuffo2015-05-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | If the compositor sent a wl_keyboard.leave and a new wl_seat.capabilities without the keyboard bit we would end up deleting the Keyboard object with a roundtrip in flight, ending up using freed memory later. Destroy the callback when destroying the keyboard, and notify the window system the active window is active no more. Change-Id: Ie415ca62b46e0b8ef0fe4d09c8e7a8130928df90 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Let the underlying system decide the default keymap parametersv5.5.0-beta1Giulio Camuffo2015-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | By passing "" instead of hardcoded defaults we let xkbcommon decide what the default parameters for the keymap should be. The user can change that with environment variables, as described here: http://xkbcommon.org/doc/current/structxkb__rule__names.html Change-Id: I8fb037201aeababaa0aa4755cae339ae3d9800b9 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Use a FontSmoothingGamma value of 1.0Giulio Camuffo2015-04-241-0/+7
| | | | | | | | | | | | | | This is what the xcb plugin does, be consistent with it. Change-Id: I5befa2de3ff514ca0c9196eb7137682586cec126 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Use defines instead of hardcoded stringsGiulio Camuffo2015-04-241-6/+4
| | | | | | | | | | | | Change-Id: Id382a1e39f2c052fbfeb96caa9b01becb31e81c9 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Do not manually update the xkb stateGiulio Camuffo2015-04-241-1/+0
| | | | | | | | | | | | | | | | | | xkb_state_update_key() is not supposed to be used in apps with a master process, such as wayland clients, which use xkb_state_update_mask() with the state serialized by the master. Change-Id: Ie51a39ca0c567c54072b221d1ab8cf7b8ea15c55 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Move surfaces to outputsPier Luigi Fiorini2015-04-2115-50/+274
| | | | | | | | | | | | | | | | | | Moving surfaces to belong to a specific output. Surfaces can be viewed on a different output anyway. Change-Id: I9ef76300f85190d84b83431374e76e581786e4e7 Done-with: Jørgen Lind <jorgen.lind@theqtcompany.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Add client side support for media keysGiulio Camuffo2015-04-161-0/+7
| | | | | | | | | | | | | | | | | | | | Unfortunately we don't have a keysym in libxkbcommon for PlayPause, we only have Play. We're going to pretend XKB_KEY_XF86AudioPlay is really PlayPause since that is what is most common. Change-Id: I1a75d8b5b0ea360e0f62eb7a93004ba3fababfa8 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-1521-52/+54
|\| | | | | | | | | | | | | | | Conflicts: src/client/qwaylandshmbackingstore.cpp src/client/qwaylandwindow.cpp Change-Id: I795fd08f0fc5d3cb5ed55bf16e724f66b7567723
| * brcm-egl: Avoid conflicts with GLES3v5.4.2Pier Luigi Fiorini2015-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qopengl.h includes GLES3 which conflicts with GLES2 declarations. Might happen because Qt is built with desktop GL. This patch fixes the following build error. In file included from ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp:61:0: /opt/vc/include/GLES2/gl2.h:600:125: error: conflicting declaration of C function 'void glShaderSource(GLuint, GLsizei, const GLchar**, const GLint*)' GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length); ^ In file included from /usr/include/qt/QtGui/qopengl.h:97:0, from ../../../../../include/QtCompositor/5.5.0/QtCompositor/private/../../../../../src/compositor/hardware_integration/qwlclientbufferintegration_p.h:46, from ../../../../../include/QtCompositor/5.5.0/QtCompositor/private/qwlclientbufferintegration_p.h:1, from ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.h:44, from ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp:44: /usr/include/GLES3/gl3.h:475:29: note: previous declaration 'void glShaderSource(GLuint, GLsizei, const GLchar* const*, const GLint*)' GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length); Change-Id: I49ae11457b70b05f740ce70b8c1cfa5d6aa554bb Reviewed-by: Olivier Blin <qt@blino.org> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Remove .desktop suffix to appIdPier Luigi Fiorini2015-04-101-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The appId is the desktop entry identifier. According to the desktop entry specifications [1], for applications the part of the name should follow the reverse DNS convention (see [2]). To do this we use the application domain if available, otherwise for lack of information we fall back to the executable base name like other toolkits such as Gtk+ do. [1] http://standards.freedesktop.org/desktop-entry-spec/latest/ [2] http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s02.html Change-Id: I181ad23a9736844e07e8060d78e756a943c27f67 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Don't handle mouse events in decos if buttons were pressed in the content areaGiulio Camuffo2015-04-081-1/+2
| | | | | | | | | | | | | | | | This fixes the decorations stealing the mouse events when going outside the content area. Change-Id: I8f3592fbda6b9c1da6498d74820a73be11c6999d Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * examples: remove unused windowDestroyed signalOlivier Blin2015-03-312-15/+0
| | | | | | | | | | | | | | | | | | | | | | Unused since commit fc439e40e37f9c0b3108225f951fb19bb3abee80 Rework the way buffers are used and rendered Also remove associated slots that are now empty in server-buffer. Change-Id: I33be0bc6a5e175553d28e9ead54fefd2f0c07ce0 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Fix build for brcm-egl integrationPier Luigi Fiorini2015-03-301-3/+0
| | | | | | | | | | | | Change-Id: I5540dfb8e115ab6b3c90bb78618b277783a912f3 Reviewed-by: Olivier Blin <qt@blino.org> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * brcm-egl: Disambiguate wl_registryPier Luigi Fiorini2015-03-301-0/+1
| | | | | | | | | | | | | | | | | | Include wayland-client.h to disambiguate between QtWaylandClient::wl_registry and wl_registry. Change-Id: Idf33fd56a6b2c2436f5cbabc953980d05826ebba Reviewed-by: Olivier Blin <qt@blino.org> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * qwindow-compositor: fix rendering shm NPOT textures with OpenGL ES2Olivier Blin2015-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use GL_CLAMP_TO_EDGE instead of GL_REPEAT, since OpenGL ES2 doesn't support NPOT textures in combination with GL_REPEAT by default, and repeat is not needed anyway. See also qtbase commits: 8dfeb1c374972f06759a92b4edc5d6a18b96ccec 8ab1323842433fb6b45e7d6f381b4b9710a81da9 72558e810d9b3493dabfc936fa6c8bf3c3f3b49c Change-Id: I01770fe3352da05baf6898d63c091bfae95e7a98 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Drop unused mScreensInitialized variable in QWaylandDisplayOlivier Blin2015-03-291-1/+0
| | | | | | | | | | | | | | | | | | Unused since commit 78a701272e68d4f0ab95df4062374b8d34ef2919: Made wayland plugin single-threaded, yay :) Change-Id: I1fae78d77179feaac79f5dba6dcad8084e3e97fa Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Fix shm buffers init and destruction on failureOlivier Blin2015-03-272-5/+12
| | | | | | | | | | | | | | | | | | | | Some pointers need to be initialized in QWaylandBuffer and QWaylandShmBuffer, and checked at destruction. This avoids crashes when shm surface creation fails. Change-Id: I6f6afa3cc6c67533b5130700cbc27b271764109e Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Fix connecting to surfaceDestroyedOlivier Blin2015-03-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | It was being called with a garbage pointer, since the signal does not have an object argument anymore. This has been changed in commit fc439e40e37f9c0b3108225f951fb19bb3abee80 Rework the way buffers are used and rendered Change-Id: I220c52285909dc93aebd128fc418df3c8a6bd37c Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Fix BrcmBuffer buildOlivier Blin2015-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | It got broken after commit b332630c86014eada07990acf66c13e000b3482b: Fix generated code for interface names not starting with qt_ or wl_ Like done in xcompositebuffer.h Change-Id: Ib9b44536d4214737d8d68d62c8512e18a80d5b5d Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Remove useless EGL linking in pluginsOlivier Blin2015-03-275-10/+0
| | | | | | | | | | | | | | | | EGL libs are already linked from the hardwareintegration pri file, and the plugins do not make direct use of any EGL symbol. Change-Id: If6ecfee16e8c9d8fee67f03419941ced92d1eff8 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Make QWaylandShellSurface a QObject to allow build without RTTIOlivier Blin2015-03-274-7/+11
| | | | | | | | | | | | | | | | | | | | | | dynamic_cast can not be used when RTTI is disabled, so make QWaylandShellSurface a QObject. QWaylandWlShellSurface and QWaylandXdgSurface must also inherit from QWaylandShellSurface first, to properly inherit from QObject. Change-Id: I2addb8105a0fe61615d4bc905414f7ee7277029f Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * ShellSurface: fix leak of QWaylandSurfaceItem on destructionOlivier Blin2015-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The QWaylandSurfaceView/QWaylandSurfaceItem object is never destroyed from ShellSurface. This was also leaking the underlying GL texture. Task-number: QTBUG-41180 Change-Id: If74c956075744115b8b5a7e8cb89b584714ec7e6 Done-with: Nicolas Marc <nicolas.marc@softathome.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Use Qt foreach instead of C++11 specific range-base for loopOlivier Blin2015-03-241-1/+1
| | | | | | | | | | | | | | To fix build with compilers without C++11 support. Change-Id: If5a5d5d874b196f60bcc5b7bd5a543b58f9c89a3 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
| * Fix build with gcc <= 4.5Olivier Blin2015-03-201-1/+1
| | | | | | | | | | | | | | nullptr is not defined with gcc <= 4.5, use 0 instead. Change-Id: I90d9170e57258f26b8ba7770a957a135539364de Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Fixed license filesJani Heikkinen2015-04-023-683/+182
| | | | | | | | | | | | | | | | | | Removed unnecessary license files (LICENSE.GPL & LICENSE.LGPL ) and added missing ones (LICENSE.LGPLv21 & LICENSE.LGPLv3) Change-Id: Id42db1372d19e934480e84a64e9064dff31ca708 Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Tests: Blacklist tst_WaylandCompositor::keyboardGrabCaroline Chao2015-03-301-0/+2
| | | | | | | | | | | | | | | | This test is currently failing in CI on Ubuntu 14.04. Task-number: QTBUG-45108 Change-Id: Ibb364171356f742e5a1f9818e0938bde5f2a8f76 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Remove local documentation templateTopi Reinio2015-03-243-776/+0
| | | | | | | | | | | | | | | | | | | | Any documentation config can simply include the global template with include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) Change-Id: I58298deeed5267776589d019a3df293b43c3a755 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Add required CONFIG conditions to pro fileCaroline Chao2015-03-201-0/+2
| | | | | | | | | | | | | | The module will be skipped if the conditions are not met. Change-Id: I99593777348bd8c74e8c32f0a4ff482bbaa8812d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Fix the compositor testGiulio Camuffo2015-03-193-2/+10
| | | | | | | | | | | | | | | | | | | | | | Output handling in the compositor changed, so update the test accordingly. As a side effect we now send an additional wl_output.scale event, so have the client handle it. Also the mapping between wayland's and QImage's format changed so make it succeed again. Change-Id: I66d32725c54d93ca1512a6a0ddaf466f58984afc Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Test: Fix compilation error in compositor testCaroline Chao2015-03-181-1/+1
| | | | | | | | | | | | | | | | The constructor takes 2 arguments. Change-Id: I4a6d231a163e896261d3c39e3625de07ce832ba2 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Disable -Wcast-qual in qtwaylandv5.5.0-alpha1Thiago Macieira2015-03-103-0/+9
| | | | | | | | | | | | | | | | | | We have a lot of generated C source code that needs to do casting and C doesn't have const_cast, so the -Wcast-qual option produces a lot of noise. Let's make sure it isn't enabled in qmake.conf or qt_common.prf. Change-Id: Iee8cbc07c4434ce9b560ffff13c9635861a8eca9 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Send done and scale events only when clients support wl_output >= 2Pier Luigi Fiorini2015-03-101-8/+14
| | | | | | | | | | | | | | | | Those events were added with wl_output version 2 and we can't send them to clients supporting wl_output version 1. Change-Id: I4a673b8cc0476675532d31b4391a537d8473987b Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Check the surface input mask for hover eventsGiulio Camuffo2015-03-102-9/+8
| | | | | | | | | | | | | | | | We also remove the hoverLeaveEvent() reimplementation, as it serves no real purpose. Change-Id: Ic218be864564032c38f91d3946ccfdf2ccfc0d25 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-201-2/+9
|\| | | | | | | Change-Id: I03fd08fc0576ffac813f64905c23de4d65e67433
| * Run eventDispatcher in QWaylandDisplay::forceRoundTripMartin Gräßlin2015-02-171-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the application uses QCoreApplication::setEventDispatcher before the QGuiApplication is created the blocking roundtrip might block the application indefinitely. This can happen if the application starts a Wayland server in the same process before the QGuiApplication is created. And the QtWayland plugin connects to this server. In this case a roundtrip blocks as the Wayland server cannot process the events the QWaylandDisplay is waiting for. By running the event dispatcher manually and using the pending variant for dispatching the Wayland event queue, the application can be kept alive. Change-Id: I9c36fccbae8921e1ae9a0a8b7f460520b1b65d5c Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* | Update copyright headersJani Heikkinen2015-02-17335-4614/+3150
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I5a74d32515c3f1fe7aa1916f4241c92832510f8c Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* | Fix buildGiulio Camuffo2015-02-171-0/+2
| | | | | | | | | | Change-Id: I790e9bfbcffc7458e2a46f2da32dcbde0c6bffe8 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Add a way to get the native hardware integration buffer for a sufaceGiulio Camuffo2015-02-172-0/+6
| | | | | | | | | | | | | | | | | | | | When running on wayland-egl it will be a EGLImageKHR. The compositor can then use it to pass it to something like a hardware compositor, or a parent compositor using the egl extension EGL_WL_create_wayland_buffer_from_image. Change-Id: I61a165c9af444509f28ab92d00be146e2e78eb52 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Add a integration hook to get the wayland queue used by the QPA pluginGiulio Camuffo2015-02-161-0/+2
| | | | | | | | | | | | | | This comes handy for clients directly using raw wayland objects. Change-Id: Ie526ac7b25a6c6a34ce61699103e612616bffbb8 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 08:07:23 +0000