summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
Commit message (Collapse)AuthorAgeFilesLines
* Get rid of missing qmake warning.Samuel Rødal2011-08-051-2/+0
| | | | | | | Change-Id: I470e89cb5b2042cda1811ef327e0703c7510fd08 Reviewed-on: http://codereview.qt.nokia.com/2683 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Undefine "slots" before including cocoa headers to make it compileGunnar Sletta2011-08-052-0/+2
| | | | | | | Change-Id: Id2ba9d657a93e0d10b70b31b6a44a6ea9f598d8f Reviewed-on: http://codereview.qt.nokia.com/2328 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Merge "Merge remote branch 'gerrit/master' into refactor" into refactorJørgen Lind2011-08-041-3/+3
|\
| * Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-031-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlinecontrol_p.h src/gui/widgets/qtabwidget.h Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
| | * Changed QLibrary::resolve() to return a function pointer.Kim Motoyoshi Kalland2011-07-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the C++ standard, there is no guarantee that you can cast between function pointers and void pointers without data loss (section 5.2.10-6). Change-Id: I27f4d835e4c8ca8ecca0d76cfea9ce34491956bd Reviewed-on: http://codereview.qt.nokia.com/1995 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* | | Initial support for Qt using Kernel Mode-setting (KMS)Andy Nichols2011-08-0418-0/+1864
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This platform plugin supports fullscreen OpenGLES2 windows on devices that support Kernel Mode-setting. Change-Id: I7d4077319654c13851f0ff7ec0228b7b13936382 Reviewed-on: http://codereview.qt.nokia.com/2516 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | | Mac: fix crash when creating a new windowRichard Moe Gustavsen2011-08-031-3/+1
|/ / | | | | | | | | | | | | Change-Id: I90f7bff954f3710f48d7416287bb5debafa94447 Reviewed-on: http://codereview.qt.nokia.com/2570 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* | Fix compilation of Minimalplugin, add documentation.Friedemann Kleint2011-07-292-8/+16
| | | | | | | | | | | | | | Change-Id: I3b40eed781905610cc3062d25dcccf5f760de1f0 Reviewed-on: http://codereview.qt.nokia.com/2382 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Make QPlatformIntegration not have a factory for eventdispatcherJørgen Lind2011-07-2813-52/+49
| | | | | | | | | | | | | | | | | | but rather an accessor for the guiThreadEventDispatcher Change-Id: I1b9ba14efc9f338c5a67e3e24ddb0caf76c07413 Reviewed-on: http://codereview.qt.nokia.com/2321 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Initial OpenWFD supportJørgen Lind2011-07-2724-0/+2344
| | | | | | | | | | | | | | Change-Id: I06f71073ec58af1a431edb997f3a359800320196 Reviewed-on: http://codereview.qt.nokia.com/2288 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Get the eglfs plugin compiling.Samuel Rødal2011-07-269-97/+86
| | | | | | | | | | | | | | Change-Id: I5addb1a2593a670d559b9fbf9183f52af410895b Reviewed-on: http://codereview.qt.nokia.com/2176 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Drag and drop support in Wayland plug-in.Laszlo Agocs2011-07-257-2/+525
| | | | | | | | | | | | | | Change-Id: I5e4448a9b3d3df9e3a12733386079031be340a42 Reviewed-on: http://codereview.qt.nokia.com/2101 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Pixmap cursor support in QWaylandCursor.Laszlo Agocs2011-07-252-15/+64
| | | | | | | | | | | | | | Change-Id: I7075229584e9705fae63679b5512c11fd8535797 Reviewed-on: http://codereview.qt.nokia.com/2100 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Added workable QScreen API on top of QPlatformScreen.Samuel Rødal2011-07-2518-236/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformIntegration::screens() no longer has to be implemented, implementations should call QPlatformIntegration::screenAdded() for each screen instead. This is for being able to support adding screens at run-time later on, by connecting it to a signal in QGuiApplication. The QGuiGLContext API has changed a bit, by not sending in all the parameters in the constructor but instead having a create() function. The createPlatformGLContext() factory in QPlatformIntegration takes a QGuiGLContext * instead of a QSurfaceFormat and a share context, similar to how the window and backing store factory functions work. The XCB plugin has experimental support for connecting to multiple X displays simultaneously, creating one or more QScreen for each. Change-Id: I248a22a4fd3481280710110272c04a30a8021e8f Reviewed-on: http://codereview.qt.nokia.com/2103 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Handle failed SHM attach in XCB backing store.Samuel Rødal2011-07-211-15/+39
| | | | | | | | | | | | | | Change-Id: I5f97c0c6030d13b68cfc17d19ba969cd78f79c3f Reviewed-on: http://codereview.qt.nokia.com/1943 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Rename QPixmapData to QPlatformPixmap.Samuel Rødal2011-07-1933-61/+61
| | | | | | | | | | | | | | | | | | Makes the API symmetric with the other Lighthouse APIs. Change-Id: I8a399f3c968ea35d4624711b31f2ac5bb94b7893 Reviewed-on: http://codereview.qt.nokia.com/1735 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-124-7/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qicon.cpp src/gui/image/qicon.h src/gui/image/qicon_p.h src/gui/text/qfontdatabase.cpp src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp sync.profile Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
| * Remove more references to demos.Casper van Donderen2011-07-081-2/+2
| | | | | | | | | | | | | | Change-Id: I431184cd0534c86047706fdaa1045b2935de5d7a Reviewed-on: http://codereview.qt.nokia.com/1307 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Fixed wayland windowmanager-protocol authorizationMartin Zielinski2011-07-083-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The authorization is now handled more robust. The client tries to authenticate as soon as a surface is created, but does so only if the authentication token is valid. A re-authorization than happens when requestActivateWindow() is called. This is needed to get the auth-process properly working even with pre-started clients, that do not have a valid token on surface-creation time. Change-Id: I4371b424686b9d5a6a163a802ec66a33c0aeeea7 Reviewed-on: http://codereview.qt.nokia.com/1207 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lasse Holmstedt
| * We need to let the currentContext be in the same state afterJørgen Lind2011-07-061-1/+8
| | | | | | | | | | | | | | | | | | | | setting the new eglsurface (cherry picked from commit af3efefeefe686e5c35ed502de077c0bcb6f6fc0) Change-Id: Ic1d62b21a1482d1bc7f1d99478e175e4b767e157 Reviewed-on: http://codereview.qt.nokia.com/1209 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * Fix the wayland windowsurface so that we have stencil and depth bufferJørgen Lind2011-07-061-1/+1
| | | | | | | | | | | | | | | | | | (cherry picked from commit 322c96eb9564f930a63be820c22b053630663880) Change-Id: I89c10cea1a302d9549024940e49c7d5960abb953 Reviewed-on: http://codereview.qt.nokia.com/1210 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* | Fix minimal plugin for windowsOlli Werwolff2011-07-071-0/+8
| | | | | | | | | | | | | | Change-Id: Ica017cdad4c8205706b42767035d834498b63037 Reviewed-on: http://codereview.qt.nokia.com/1268 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into ↵Lars Knoll2011-07-061-2/+2
|\ \ | | | | | | | | | refactor
| * | Fixed gl_integration.pri on non-mac platforms.Samuel Rødal2011-07-061-2/+2
| | |
* | | Merge remote branch 'gerrit/master' into refactorLars Knoll2011-07-069-52/+278
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/opengldesktop/opengldesktop.cpp examples/itemviews/interview/interview.pro examples/mainwindows/mainwindow/mainwindow.pro examples/openvg/README examples/richtext/textedit/textedit.pro examples/tools/undo/undo.pro src/corelib/global/qglobal.h src/corelib/kernel/qcoreapplication.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qmetatype.h src/gui/kernel/qevent.cpp src/gui/kernel/qevent.h src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/gui/text/qfontdatabase.cpp src/opengl/qgl.h src/openvg/qpaintengine_vg.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp tests/auto/qmainwindow/qmainwindow.pro Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
| * Add QScreenOrientationChangeEvent and rotation support to wayland clientLasse Holmstedt2011-07-044-22/+37
| | | | | | | | | | | | | | | | | | | | | | Qt Compositor propagates screen orientation changes to wayland, which are then picked up by the wayland client. The wayland client then sends a QScreenOrientationChangeEvent to QApplication, which can handle the orientation change. Change-Id: Ieb2225e52b7e3c318648f2cb21dab7937f301505 Reviewed-on: http://codereview.qt.nokia.com/1063 Reviewed-by: Matthias Ettrich
| * Implemented on-screen visibility handling via waylandMartin Zielinski2011-07-014-41/+64
| | | | | | | | | | | | | | | | | | | | | | | | The compositor informs the client about it's window not being visible at all. This is handled here by dispatching a ApplicationActivated/ApplicationDeactivated event. The application than is free to handle this event and stop rendering and other not needed processing. Change-Id: I1dcc3f2a4a8e63ad5cc4f89cbf82cc63f779edbf Reviewed-on: http://codereview.qt.nokia.com/763 Reviewed-by: Lasse Holmstedt Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * Add touch event support to wayland plugin.Laszlo Agocs2011-06-304-8/+196
| | | | | | | | | | | | | | Change-Id: If4be4965ae4e9898f5afb756632aa0349bd9b149 Reviewed-on: http://codereview.qt.nokia.com/935 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * Removed damaging of waylandsurface after creationMartin Zielinski2011-06-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | The damaging of the surface at this time causes graphical corruption in the compositor, as the surface does not contain any rendered output yet. Change-Id: I51392a68a7531db9901137b9861cb0291e16ff12 Reviewed-on: http://codereview.qt.nokia.com/743 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthias Ettrich Reviewed-by: Lasse Holmstedt
* | Cocoa: Window type and flags handling.Morten Sorvig2011-07-012-7/+175
| | | | | | Bring over code from Qt4's qwidget_mac.mm.
* | Cocoa: Fix raise/lower.Morten Sorvig2011-07-011-2/+2
| |
* | Clean up wayland-cgl-readback.Morten Sorvig2011-07-011-16/+6
| | | | | | | | | | | | Read directly into the window buffer - looks like we don't need to do any byte swapping. Disable the frame sync, since this causes a deadlock with the compositor.
* | Cocoa: Fix RGB/BGR color inversion.Morten Sorvig2011-06-291-1/+1
| |
* | Set mac wayland config.Morten Sorvig2011-06-282-1/+16
| |
* | Add wayland mac readback implementation.Morten Sorvig2011-06-287-0/+527
| |
* | Factor out CGL code for reuse in wayland.Morten Sorvig2011-06-281-20/+5
| |
* | Remove load(eventdispatchers).Morten Sorvig2011-06-281-1/+0
| |
* | ibus IM support for the xcb backendLars Knoll2011-06-274-0/+35
| | | | | | | | | | | | | | | | Test code to check input methods using the ibus backend used on e.g. ubuntu. The IM code is not very sophisticated, but enough to test that things are working. Reviewed-by: Jørgen Lind
* | Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-275-15/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro demos/embedded/digiflip/digiflip.pro examples/examples.pro examples/graphicsview/embeddeddialogs/embeddeddialogs.pro src/gui/kernel/qplatformglcontext_qpa.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
| * Have the selection offer global handled always without delay.Laszlo Agocs2011-06-246-28/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a previous attempt to solve the problem of selection offer globals arriving too early, the handling was delayed. This solved the issue of crashing but introduced a timing issue, because the offers (the mime types) will arrive immediately after the global and therefore will simply be ignored in case the delayed processing of the selection offer had not yet been done. The visibility of the problem depended on the implementation of the compositor, with recent changes to qt-compositor the issue is very visible. The patch solves the issue properly: The wayland clipboard instance is created right away, as early when needed, and the integration will simply pick up the already created instance. Change-Id: I75aaba4b0590c05cc0091bed7bb3593186c1188f Reviewed-on: http://codereview.qt.nokia.com/687 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * Make sure to call damage on the buffer when we damage itJørgen Lind2011-06-235-16/+18
| | | | | | | | | | | | | | Change-Id: Id325a1dee322c2b37215e6577870068260f5f7cc Reviewed-on: http://codereview.qt.nokia.com/683 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
| * Update the wayland pluginJørgen Lind2011-06-234-11/+38
| | | | | | | | | | | | | | | | | | to sha1 bfea3d6befdb688d5354e6f15a9400ea637febf9 Change-Id: Ie855cfbc6b786f1e738e205d403478614774ad34 Reviewed-on: http://codereview.qt.nokia.com/682 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Handle really global selection offers in wayland clipboard.Laszlo Agocs2011-06-102-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle selection offer globals properly even if they arrive during the initial blocking read. If such a global arrives so early, the platform integration is not yet available from QApplicationPrivate (as it is just being constructed). Therefore the handling of the selection offer has to be delayed. At the moment selection offers are typically posted as globals and not added to the global list, but that is likely to change in the future. Change-Id: Ib4ae804ad7f19e05978ee08828b88e028a3bf7b2 Reviewed-on: http://codereview.qt.nokia.com/446 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Get declarative and wayland EGL backend working for Qt compositor.Samuel Rødal2011-06-238-105/+130
| |
* | Make sure to call damage on the buffer when we damage itJørgen Lind2011-06-234-17/+15
| |
* | Update the wayland pluginJørgen Lind2011-06-234-12/+40
| | | | | | | | to sha1 bfea3d6befdb688d5354e6f15a9400ea637febf9
* | Refactor window system event dispatching.Morten Sorvig2011-06-232-7/+5
| | | | | | | | | | | | | | | | | | | | Add QWindowSystemInterface::sendWindowSystemEvents, which contains the canonical "empty and send queued window system events" implementation. Make the Cocoa, QPA, and GLIB dispatchers use the new implementation. Cocoa now no longer inherits from QPA.
* | Prevent endless loop when calling QWaylandShmWindow::format().Samuel Rødal2011-06-221-1/+1
| |
* | Get wayland plugin working again.Samuel Rødal2011-06-225-7/+16
| |
* | Compile.Morten Sorvig2011-06-221-1/+1
| |