summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Workaround for i.MX6 Wayland client crashwip-compositor-apiPaul Olav Tvete2016-03-031-1/+4
| | | | | | | | | | | | | | There is a bug in some versions of the Vivante driver, causing clients to crash when a window is closed. This patch avoids a crash on startup, confirmed with GL version "OpenGL ES 3.0 V5.0.11.p4.25762". The crash happens with both Weston and Qt-based compositors. Since we do not yet know exactly which versions are affected, we avoid destroying the temporary surface for all Vivante versions. Change-Id: I4b5b0ebb04b8441559aebb54a6ec3eb534c5c8e0 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Send correct mouse press positionPaul Olav Tvete2016-03-011-0/+1
| | | | | | | | | | | | The Wayland protocol sends mouse presses without position, relying on mouse moves to be sent first. Qt sends positions with mouse events. Make sure that the position is correct by sending a move event for each press event. Change-Id: I6a1a9ee8b130011f0d180c878a7d273e11f72fa2 Reviewed-by: Mikko Levonmaa <mikko.levonmaa@bitfactor.fi> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> (cherry picked from commit 70e2dd9083affa32355b7ab763165dbfcbccee5f)
* update plugins.qmltypesShawn Rutledge2016-02-293-108/+347
| | | | | | | | | | This requires a couple of null pointer checks because of the platform plugin that qmlplugindump uses. Change-Id: Icb7c0ac1c71ddf69f6c3d9e0013dd6b5e2ef5ab9 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> (cherry picked from commit 01a967af0e8034851000bde640774c008939175c)
* Proper fix for buffer destructionPaul Olav Tvete2016-02-291-5/+12
| | | | | | | | | | | | | | The previous fix (93ca929fb9caf347150) would always crash on client exit. It tried use the same destroy_listener on several buffers. Due to the way linked lists are implemented in Wayland, a listener can only be listening to one signal at the time. The correct way to do this is to create a new listener for each buffer. Change-Id: Ie94dd8cd2d3dc7f93a0526c5c585a8feab3b7354 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com> (cherry picked from commit d6fe7b6165859e17f0308cd28ab0cd2e2e3db294)
* Fix destroy listener signal connectionLaszlo Agocs2016-02-291-1/+1
| | | | | | | | | | Remove it from the list in the callback, not when a new buffer is created later on. Change-Id: I2328edec9728752d18efaecede19eb4527d0f578 Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com> (cherry picked from commit 93ca929fb9caf34715012dec608afd42e6ccf1e5) Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* Link with the wayland-client libraryPaul Olav Tvete2016-02-291-0/+6
| | | | | | | Change-Id: I888f7289285a57a7c0a4a01054b4f691b178ad73 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from commit 68c65ddfa94be74d9c35ec056d48dd961387799d) Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* Fix memory corruptionPaul Olav Tvete2016-02-151-2/+2
| | | | | | | Don't use references to temporary objects. Change-Id: I786c90273ac835309fe5ac4ecc3372de185e490e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* A minimal c++-based compositorPaul Olav Tvete2016-01-127-0/+468
| | | | | | | | | No input handling. Change-Id: Ie35f8ad5ff7317c83b9b76bc5c45adaca8bdb6fb Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> (cherry picked from commit a3aa68222d586f38e261f8dae5b2d50230f3ebb3) Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Don't create wl_surface for desktop widgetsPaul Olav Tvete2016-01-121-2/+2
| | | | | | Change-Id: I3ebcb49a4acf230b9515c0317aab2307dcb9270b Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> (cherry picked from commit baec8be7294a176620253dbbc1b2938cf96c8360)
* Fix the control keyPaul Olav Tvete2016-01-121-0/+7
| | | | | | | | | | | Let Ctrl+A cause a key event with text Ctrl+A (0x01), like we do on the other platforms. Previously we would use 'A', which would confuse some applications. Task-number: QTBUG-50398 Change-Id: Ie3def4bd9c96e538b2572b88fae029d347e08814 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> (cherry picked from commit b0d02b3cfd39f6a8815cc07848ca865257cd2c9f)
* Merge remote-tracking branch 'qt/5.6' into wip-compositor-apiPaul Olav Tvete2015-12-0234-344/+108
|\ | | | | | | Change-Id: Ie70fdd03e1259a8cb75bbdbf1324e3e4a2b51807
| * Get rid of the egl config test and use what qtbase providesLaszlo Agocs2015-11-1115-86/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contains(QT_CONFIG, egl) and CONFIG += egl is the only sane way to test for and pull in EGL headers and libs. This is particularly important when trying to be robust and guard against half-broken sysroots on embedded where a naive PKGCONFIG += egl breaks. Also add an EGL_WAYLAND_BUFFER_WL define to keep wayland-egl compiling. We are not testing for that in any config tests may cause a failure in sysroots that have parts of Mesa thrown in but pick ip an older EGL header from the vendor's driver. Change-Id: I7b7e6a7a91e78dbda5b6954ad08761298c538efc Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * RPi: Resolve all BRCM functions dynamicallyLaszlo Agocs2015-11-116-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | Directly calling eglCreateGlobalImageBRCM and friends is not ideal due to the messy RPi distro setups: shipping Mesa (sw rasterizer only) in standard locations may cause picking up those EGL/GLES libs instead of the Broadcom ones from /opt/vc when building Qt. While this is something that should be fixed in the sysroot (since it is a problem at runtime anyway), let's make life easier by resolving via eglGetProcAddress, which is the right approach in any case. Change-Id: I73f7698b638691d97743a6f819bc7c8ee6ebd245 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Fix compiler warnings.Friedemann Kleint2015-11-052-1/+2
| | | | | | | | | | | | | | | | qwaylandinputcontext.cpp:57:16: warning: unused parameter 'sym' [-Wunused-parameter] qwaylanddatadevice.cpp:173:135: warning: 'dragData' may be used uninitialized in this function [-Wmaybe-uninitialized] Change-Id: Id654360fd9b7fdb572565ad39b664af3355b5e79 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * client: Remove the event threadGiulio Camuffo2015-11-036-232/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the compositor sends events to us while the main thread is blocked the socket notifier in the events thread would keep sending out the activated() signal, but no events would actually be read until the main thread starts to run again. That causes the event thread to keep queueing new events, and so allocating memory, potentially forever. This patch fixes the issue in maybe a bit radical way, that is by removing the event thread. The socket notifier now runs in the main thread so it will block if the events are not being read. Nowadays there is no real reason to keep the event thread around, as every thread that needs to receive wayland events can dispatch them on its own, we don't need a central dispatcher thread anymore. Change-Id: Ib7885e4b038b82719d78d193f465618a72cbe6af Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
| * CMake: Create CMake files for WaylandClientKevin Funk2015-11-024-1/+22
| | | | | | | | | | | | | | | | | | Also add unit tests Change-Id: I66de887607f73b318884e4a35f18510b90cf0315 Task-number: QTBUG-47357 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Add wl_shell_surface as nativeResourceForWindowMartin Gräßlin2015-10-301-0/+10
| | | | | | | | | | | | | | Allows to get the wl_shell_surface for a QWindow, if it exists. Change-Id: I16b1c578a1c605e58c96e94ae55a3331ecfa353d Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| * Fix deadlock when starting a dragGiulio Camuffo2015-10-291-13/+1
| | | | | | | | | | | | | | | | | | | | With commit c55a36cb9015cf1eebd49eaa5b1b4f4ec9b28451 in qtbase the QSimpleDrag code changed in a way that caused a deadlock due to drawing a window without a role. However, thanks to that we can now remove that start/cancel hack and simplify the code. Change-Id: Icba6e7c9c4927855e48fb21632db1a10332c4ffb Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Add clients with the correct versionPier Luigi Fiorini2015-11-287-12/+12
| | | | | | | | | | | | | | | | | | | | | | Wayland clients might implement an older interface version, in that case we don't want to send unsupported requests. To ensure that we pick the lower version between the one asked by the client and the one we actually implement on the server. Change-Id: I4865780505db171295897fc7f6567c6f88e598fa Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Update git ignore listPier Luigi Fiorini2015-11-281-2/+9
| | | | | | | | | | Change-Id: I60548698d8b6ba68cdf1a4069424f8709f153550 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Mark reimplemented methods as overridePier Luigi Fiorini2015-11-281-13/+13
| | | | | | | | | | Change-Id: I2a1f9dee1bc7f29a8e81b2429f49748ee477bd4f Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Fix typo in QWaylandQuickOutput warningPier Luigi Fiorini2015-11-281-1/+1
| | | | | | | | | | Change-Id: I0f45e4b510e898d4107b80b1a61d64c86513ec85 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Add keyboard repeat rate and delayPier Luigi Fiorini2015-11-283-1/+75
| | | | | | | | | | | | | | | | | | Add getter and setter for repeat rate and delay. This has no effect until the compositor has support for Wayland 1.6 which has not yet been done due to CI lacking a recent library version. Change-Id: I55a9c48dcb974d5fff437fd79148ce02d74beccb Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Compile fix for namespaced Qt buildsPaul Olav Tvete2015-11-286-4/+22
| | | | | | | | | | | | Change-Id: Ie23f7c01331d5e52dcf30952d7ad9ade6ef5a5e0 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* | Rename setPopup surface argumentPier Luigi Fiorini2015-11-271-1/+1
| | | | | | | | | | | | | | | | | | Make setPopup signature consistent with setTransient and fix potential issues with QML since "parent" is special. Change-Id: Ib3736af63d106f50379b3e296b73d8690d9bc09f Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Doc: Change a few parameter values in the qdocconfVenugopal Shivashankar2015-11-112-12/+9
| | | | | | | | | | | | | | | | | | | | The waylandcompositor API will be part of Qt so the docs for it should use the Qt reference documentation URL and version. The index page for the module cannot be named 'index.html' as it conflicts with the Qt reference doc main page. Change-Id: I3d8c45dac7a896e9bd6a2ab5f1c6d4f7018810ed Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Fix crash on client exitPaul Olav Tvete2015-11-091-0/+2
| | | | | | | | | | | | | | | | | | | | Wayland linked lists are implemented by having next and prev pointers in the objects themselves. This means that an object can only be in one list at the time. If the object is not removed from a list before being inserted into another, the original list is corrupted. Change-Id: Idc6cfc507f7d7ff30a365fda01c4f9729335ae09 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Fix copyright headersPaul Olav Tvete2015-11-0936-92/+98
| | | | | | | | | | | | | | | | Old copyright headers were accidentally used for some new code. Change-Id: I0230d350e59701bc6b383c7c8151d52e34e8e75a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Try to get wl_display from the platform pluginPaul Olav Tvete2015-11-061-2/+6
| | | | | | | | | | | | | | | | | | Some platforms require that the platform plugin creates the wl_display. If so, use that one. Change-Id: Ice7e0f79d525c0c7c1f79794dd6719ff8c3c7c80 Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Add install targets for new examples.Paul Olav Tvete2015-11-045-1/+16
| | | | | | | | | | Change-Id: Ibb4ae57d82a86d5fc74679c628a5c7a9b100f71d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Texture fix for examplePaul Olav Tvete2015-11-041-0/+1
| | | | | | | | | | | | | | Make it show colors other than black... Change-Id: I0d0ef374d18c1dfbd4f1734d2d0cdcfbc2f36186 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Null pointer check for examplePaul Olav Tvete2015-11-041-2/+6
| | | | | | | | | | | | | | The documentation says that defaultOutput() is initialized later. Change-Id: I3dcc6c9dc7395c7986721235333388614928347c Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Merge "Merge branch '5.6' into wip-compositor-api" into wip-compositor-apiPaul Olav Tvete2015-10-2812-58/+315
|\ \
| * | Merge branch '5.6' into wip-compositor-apiLaszlo Agocs2015-10-2712-58/+315
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qwindow-compositor changes from 5.6 will be adapted separately. The traditional wayland-egl path is tested and is functional like before. The EGLStream support will be verified separately once the qwindow-compositor changes are ready. Conflicts: examples/wayland/qwindow-compositor/qwindowcompositor.cpp examples/wayland/qwindow-compositor/textureblitter.cpp examples/wayland/qwindow-compositor/textureblitter.h examples/wayland/server-buffer/client/client.pro examples/wayland/server-buffer/compositor/compositor.pro src/compositor/compositor_api/qwaylandbufferref.cpp src/compositor/compositor_api/qwaylandbufferref.h src/compositor/hardware_integration/qwlclientbufferintegration_p.h src/compositor/wayland_wrapper/qwlkeyboard.cpp src/compositor/wayland_wrapper/qwlkeyboard_p.h src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro Change-Id: Ic2e3a6e8f74606c35b1e27cd4016fa133527d7ba
| | * Make qwindow-compositor build on systems without ext texturesLaszlo Agocs2015-10-271-0/+4
| | | | | | | | | | | | | | | Change-Id: I47d7f7d2cb589df8087c23eda60137e7b263f11f Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
| | * Support EGLStream in wayland-eglLaszlo Agocs2015-10-2011-56/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Wayland on NVIDIA. Tested with a Jetson TK1 Pro and Vibrante Linux. With just the hw integration no compositors would work out of the box since EGL_KHR_stream_consumer_gltexture only allows connecting to the texture bound to GL_TEXTURE_EXTERNAL_OES, meaning that assumptions about the target always being GL_TEXTURE_2D break horribly both in C++ and in shader code. In addition, buffers have to be extended with an additional updateTexture() operation as EGLStream requires to call ConsumerAcquire on every frame. Previously there was no concept of this as calling createTexture() on attach() was sufficient. Qt Quick bits are omitted since the refactored compositor API is pretty different. This means that QML compositors will not currently function in this environment. The qwindow-compositor example is enhanced to support the external texture target, but this won't apply for the refactored branch either. It is provided for testing purposes for the time being, and to show how C++ compositors can support different texture targets and correct operation with EGLStreams. Done-with: Louai Al-Khanji <louai.al-khanji@theqtcompany.com> Change-Id: I0e209fc0cbcf435cca83528d938eb50e4bdceb82 Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
| | * Update focusResource if needed when wl_keyboard is boundOlivier Blin2015-10-202-8/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a QtWayland compositor gives focus to a surface right after its creation during the client startup, the keyboard resource may not be bound yet by the client. In this case, the surface is correctly marked as focused, but the keyboard resource is never marked as focused, and thus no keys are ever sent to the client. To fix this, the focusResource is updated if needed after wl_keyboard is bound. This can be reproduced with weston-simple-im (patched to use wl_shell instead of xdg_shell) and qml-compositor, modified to enable TextInputExtension and call takeFocus() at the end of windowAdded(). Change-Id: I551cb5bc56c05a1e5187b23108f4ef80468782dc Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| | * Fix setting focusDestroyListener when no keyboard resource is boundOlivier Blin2015-10-201-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | When no keyboard resource is bound, the destruction handler for the focused surface was not called, and the pointers to focused objects were not reset. Thus the m_focus surface pointer could become invalid. Change-Id: Iee404219304ae7b2bae87131ab140ab134e98118 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| | * Fix build without pkg-configLaszlo Agocs2015-10-192-5/+7
| | | | | | | | | | | | | | | Change-Id: I9217c633bcbecd330715b6dbc654245b3fb739a8 Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
| | * Fix for QStringBuilderLaszlo Agocs2015-10-191-4/+23
| | | | | | | | | | | | | | | Change-Id: I2a7b82bd2705919a91492edfccac02f4d8fc2c9b Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
* | | Workaround for qwindow-compositor on platforms other than xcbLaszlo Agocs2015-10-281-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating the QWaylandOutput after the compositor's create() posts an event to the output object and defers initialization. This is fragile since there is nothing guaranteeing the application will not get to render in the meantime and not start calling functions like defaultOutput(), which all return null since there are 0 outputs registered at that time due to the deferred QWaylandOutput::initialize(). Until the issue gets solved by redesigning the behavior somehow, swap the two lines to get qwindow-compositor running with eglfs. This way the output's initialize() is called directly from the compositor's create() and this all output-related functions are usable afterwards immediately. Change-Id: Ie4203d0a4d0ec35804ef8c320121750f02b50724 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Add documentation to Qt Wayland CompositorEskil Abrahamsen Blomfeldt2015-10-2632-38/+2127
| | | | | | | | | | | | | | | | | | | | | | This adds some preliminary documentation for the Qt Wayland Compositor. There are a few classes which remain undocumented. The documentation in some areas may be a bit minimal, but this can be expanded gradually with code examples and more details. Change-Id: I5d285a5a25e8602ac2fdddc84c3fd217e7b77c95 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Add support for popups to examplePaul Olav Tvete2015-10-233-4/+57
| | | | | | | | | | Change-Id: If2446073b69c91377f399cfd43506e6a211ac209 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | New custom extension examplePaul Olav Tvete2015-10-2320-0/+907
| | | | | | | | | | | | | | | | | | The example implements a simple Wayland extension that doesn't do anything useful. It contains a custom compositor and a wayland platform plugin. Change-Id: I88df4b20f328a32fca33b8d013d253611539526f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Example project file clean-upsLouai Al-Khanji2015-10-234-28/+19
| | | | | | | | | | | | | | Make things compile without pkg-config, remove obsolete bits. Change-Id: I9adb2653c80d519dad371b9b982826c6c41e3cb5 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Remove obsolete defineLouai Al-Khanji2015-10-231-1/+0
| | | | | | | | | | Change-Id: I858887830fbacc09ed96e4509d4dc257a31bd0ae Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Add warning to private headersPaul Olav Tvete2015-10-2321-0/+231
| | | | | | | | | | | | | | We mean it. Change-Id: I7381c7aad198dcca485d488571fd12296d07f980 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Rename QWaylandExtensionContainer to QWaylandObjectPaul Olav Tvete2015-10-2322-52/+65
| | | | | | | | | | | | | | | | | | | | Change the name, and make QWaylandExtension a subclass of QWaylandObject. This way, all extensions can have extensions of their own, without multiply inheriting. Change-Id: Ie06e764412d113f7a62399caa605a48b015c7d24 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Merge branch 'qt/5.6' into wip-compositor-apiPaul Olav Tvete2015-10-1376-199/+1735
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/wayland/pure-qml/main.cpp examples/wayland/pure-qml/qml/Chrome.qml examples/wayland/pure-qml/qml/main.qml src/client/qwaylanddnd_p.h src/compositor/compositor_api/qwaylandquicksurface.cpp src/compositor/compositor_api/qwaylandsurface_p.h src/compositor/compositor_api/qwaylandsurfaceitem.cpp src/compositor/extensions/qwlinputmethodcontext_p.h src/compositor/hardware_integration/qwlclientbufferintegration_p.h src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h src/compositor/hardware_integration/qwlhwintegration_p.h src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h src/compositor/wayland_wrapper/qwlcompositor_p.h src/compositor/wayland_wrapper/qwldatadevice_p.h src/compositor/wayland_wrapper/qwldatadevicemanager_p.h src/compositor/wayland_wrapper/qwldatasource_p.h src/compositor/wayland_wrapper/qwlextendedsurface_p.h src/compositor/wayland_wrapper/qwlinputdevice_p.h src/compositor/wayland_wrapper/qwlinputmethod_p.h src/compositor/wayland_wrapper/qwlinputpanel_p.h src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h src/compositor/wayland_wrapper/qwlkeyboard.cpp src/compositor/wayland_wrapper/qwlkeyboard_p.h src/compositor/wayland_wrapper/qwloutput_p.h src/compositor/wayland_wrapper/qwlpointer_p.h src/compositor/wayland_wrapper/qwlregion_p.h src/compositor/wayland_wrapper/qwlshellsurface_p.h src/compositor/wayland_wrapper/qwlsubsurface_p.h src/compositor/wayland_wrapper/qwlsurface.cpp src/compositor/wayland_wrapper/qwlsurface_p.h src/compositor/wayland_wrapper/qwltextinput_p.h src/compositor/wayland_wrapper/qwltextinputmanager_p.h src/compositor/wayland_wrapper/qwltouch_p.h src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h src/imports/compositor/WaylandCursorItem.qml Change-Id: I4e63ef295b297022d4970b3c68b3d565843086bd
| * Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-0579-0/+869
| | | | | | | | | | Change-Id: I70c01453b3939d1d645d626ae84c21ab4c9d267a Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 07:49:26 +0000