summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed qml-compositor failing on XComposite EGL / GLX.HEADmasterSamuel Rødal2011-09-141-0/+2
| | | | | | We also need to make sure that the QWindow has actually been created at this point, before creating a child window to be used as the fake root for composited windows.
* Don't call glDeleteTextures() when texture_id is 0.Samuel Rødal2011-09-141-1/+2
|
* Fixed XComposite hardware integration.Samuel Rødal2011-09-143-2/+4
| | | | | | | | The root window needs to actually be mapped in order for XCompositeNameWindowPixmap to work. Also make sure to set both the window and pixmap bits in case we're on a stricter EGL / GLX implementation.
* Disabled DESTDIR for the wayland platformAndy Nichols2011-09-131-1/+1
| | | | | This enables make install to work correctly. This should be fixed when this is moved into the QtWayland module.
* Build fixLasse Holmstedt2011-09-131-3/+3
|
* Cleaned up project filesAndy Nichols2011-09-131-1/+0
| | | | | Removed references to Widgets module that is not needed anymore. Also make qml-compositor deployable with make install.
* Merge branch 'refactor'Paul Olav Tvete2011-09-1384-0/+8487
|\
| * Import the wayland platform plugin from qtbase, including the qt/4.8 historyPaul Olav Tvete2011-09-1284-0/+8487
| |\
| | * Merge remote branch 'gerrit/master' into HEADSamuel Rødal2011-09-129-158/+342
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/wayland/qwaylandnativeinterface.cpp src/plugins/platforms/wayland/qwaylandnativeinterface.h Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
| | | * Generic property support for platform windowsLasse Holmstedt2011-09-059-158/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformNativeInterface can now contain generic window properties in a QVariantMap, to facilitate communication with the compositor and clients for certain platforms. When window properties change, a signal is emitted from the respective QPlatformNativeInterface instance. The properties are intended to be read/writable from both client and server. Change-Id: I7b42f7910d03c0d309add6c7dbb1c9b66ad22a3f Reviewed-on: http://codereview.qt.nokia.com/3956 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | Propogate that the size has changedJørgen Lind2011-09-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I73dde157e38933d39992cb4393297c0849ee1ae2 Reviewed-on: http://codereview.qt.nokia.com/4149 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| | * | Cocoa: Fix qmlscene flicker on startup.Morten Sorvig2011-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SG render thread was racing window creation in the GUI thread, which would cause flicker if the window won the race and was shown before the SG thread had a frame ready. Send a synchronous expose event before showing the window - this will wait for the SG render thread. In addition, don't defer NSwindow creation. The GL context setup is done before the window is shown and needs a fully created window. New API: QWindowSystemInterface::handleSynchronousExposeEvent Retire: QWindowSystemInterface::handleExposeEvent Change-Id: I0bb46089d16ec4882aaac8db67b57d15e0f51531 Reviewed-on: http://codereview.qt.nokia.com/3399 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| | * | Copy core GL functionality to QtGui with QGL -> QOpenGL naming.Samuel Rødal2011-08-2929-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855 Reviewed-on: http://codereview.qt.nokia.com/3710 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| | * | Introduce new platform capability ThreadedOpenGL.Samuel Rødal2011-08-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lets the platform plugin advertise whether it's safe to use OpenGL from a different thread. With XCB we only advertise this if we have a reasonably new XCB libary, as older versions suffer from the xcb_wait_for_reply() blocking bug, which cause GL rendering in a separate to stall when using Mesa drivers. Change-Id: I4829df7e583a1c8aed218ae13a159d21266cc594 Reviewed-on: http://codereview.qt.nokia.com/3613 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * | Merge branch 'master' into refactorGunnar Sletta2011-08-255-13/+155
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_qpa.cpp src/gui/kernel/qcursor_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.h src/gui/kernel/qwindowsysteminterface_qpa_p.h src/gui/text/qtextcontrol.cpp src/plugins/platforms/wayland/wayland.pro src/widgets/accessible/qaccessible2.h src/widgets/widgets/qwidgetlinecontrol_p.h Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
| | | * Handle EINTR gracefully in Wayland clipboard.Laszlo Agocs2011-08-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idd5082f02eb6708685421492afb8ad5b8546a5d6 Reviewed-on: http://codereview.qt.nokia.com/2810 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| | | * Support QImage and others in Wayland clipboard.Laszlo Agocs2011-08-045-12/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wayland plugin's clipboard implementation lacked support for data set via QMimeData::setImageData, QClipboard::setPixmap, etc. because everything was treated as a QByteArray. A variant having an image cannot however be converted to a byte array. Therefore, to make these convenience functions to work, the image is now encoded via QImageWriter before sending it. On the receiving side QMimeData is capable of decoding images from byte arrays, so no problem there. The patch also renames an internal QWaylandMimeData class to a more suitable clipboard-specific name as the functionality is clipboard specific. Change-Id: I77e7df903b8dbe9731613fdbb9693b2a37b05d18 Reviewed-on: http://codereview.qt.nokia.com/2616 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| | * | If the EGL_PLATFORM is not set, then set itJørgen Lind2011-08-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c1b0ba757c64fc42faacd69d4e5d1df28faf7d1 Reviewed-on: http://codereview.qt.nokia.com/3472 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| | * | Get wayland plugin working after latest QPA API changes.Samuel Rødal2011-08-052-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If54e7068aaed84fe765b887250bca79c787bd8a3 Reviewed-on: http://codereview.qt.nokia.com/2684 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| | * | 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>
| | * | Make QPlatformIntegration not have a factory for eventdispatcherJørgen Lind2011-07-284-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | 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-254-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Rename QPixmapData to QPlatformPixmap.Samuel Rødal2011-07-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-123-5/+16
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * 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>
| | * | 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: mae
| | | * 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: mae Reviewed-by: Lasse Holmstedt
| | * | 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.
| | * | Set mac wayland config.Morten Sorvig2011-06-282-1/+16
| | | |
| | * | Add wayland mac readback implementation.Morten Sorvig2011-06-287-0/+527
| | | |
| | * | Remove load(eventdispatchers).Morten Sorvig2011-06-281-1/+0
| | | |
| | * | 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-236-100/+106
| | | |
| | * | 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
| | * | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 00:33:48 +0000