summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cocoa/Alien: fix qgraphicseffectsource autotestRichard Moe Gustavsen2011-01-281-5/+8
| | | | | | | | | The test discovered a serious bug where we for alien widgets on mac returned a zero sized paintdevice. The reason is that we used to ask the nsview backing the widget for its size, but with alien, there where no such view. Very strange that this was not seen visually for any of the many applications tested. This patch does the same implementation strategy as found in QWidget::metric in qwidget_x11.cpp
* Cocoa: fix qgraphicsview autotestRichard Moe Gustavsen2011-01-282-2/+6
| | | | | | | | | | | | Moving the cursor to the corner of the desktop (0, 0) will typically trigger things to happend in the OS, at least on Mac (spaces, synergy etc). So I changed those tests to move it to (1, 1) instead. The reason to move it to (0, 0) was just to get the mouse away from the window anyway. And second, it takes some time after using QCursor::setPos on Mac before the events from the move actually arrive. And many tests that use this function relies on this. So I introduces a little delay. This alone will fix a couble of tests.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-stagingRichard Moe Gustavsen2011-01-27211-7739/+15666
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-2728-1363/+1865
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-2628-1363/+1865
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-2628-1363/+1865
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| * | | \ Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-01-2794-1549/+7908
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (69 commits) Lighthouse: License headers to new files in testlite Make sure we blit the fbo on flush in QGLWindowSurface Lighthouse: Wayland. Make the wayland integration closer to Lighthosue Lighthouse: Wayland, only make one fbo for the WaylandPaintDevice Making clearer separation between responsibility of different classes Make it possible to vertically mirror gl painting Lighthouse:Wayland Moving some logic into files Fix Wayland plugin to work with Wayland after some interfaces changed Make QGLContext::fromPlatformGLContext show correct sharing Remove Lighthouse specific code from QGLWindowSurface Fix X11 clipboard bug. Fix for uninitialized member in QWaylandCursor wayland: use pkgconfig for libdrm in wayland.pro wayland: remove non-public header from config.tests wayland: fix SOURCES to point to wayland.cpp in config.tests Wayland: request rbg and premultiplied argb visuals as needed Wayland: clamp window resizes to screen size Wayland: split GL code into separate files Wayland: use correct viewport for swapBuffers and correct coords Wayland: fix geometry of swapBuffers ...
| | * \ \ \ Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-2610602-16862/+24546
| | |\ \ \ \
| | * | | | | Lighthouse: License headers to new files in testliteJørgen Lind2011-01-2611-1/+411
| | | | | | |
| | * | | | | Make sure we blit the fbo on flush in QGLWindowSurfaceJørgen Lind2011-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: sroedal
| | * | | | | Lighthouse: Wayland. Make the wayland integration closer to LighthosueJørgen Lind2011-01-2613-39/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Today there is a connection between QWidget and QPlatformScreen. So I added a accessor in QWaylandScreen to get the corresponding QWaylandDisplay. So now it should be possible to have different QWaylandDisplays. But also its possible to use the internal Lighthouse api closer in the wayland plugin if that should be of interest ;)
| | * | | | | Lighthouse: Wayland, only make one fbo for the WaylandPaintDeviceJørgen Lind2011-01-262-87/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually the fbo belongs to the QWaylandPaintDevice, which also holds n QWaylandDrmBuffers. Then the QWaylandDrmWindowSurface gets the current drmbuffer used on flush and attaches it to the window and calls wl_surface_damage
| | * | | | | Making clearer separation between responsibility of different classesJørgen Lind2011-01-2615-327/+563
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ie. Moving code into different files and refactoring some of the classes. The Drmbuffer was most affected. It has a depth and stencil buffer. QWaylandGLContext contain the context. The drm buffer class has to be bound to the context before used.
| | * | | | | Make it possible to vertically mirror gl paintingJørgen Lind2011-01-263-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GLPaintDevice gets a flip property. If this is set, the pvr matrix is altered to paint "upside down" Reviewed-by: sroedal
| | * | | | | Lighthouse:Wayland Moving some logic into filesJørgen Lind2011-01-2618-631/+1121
| | | | | | |
| | * | | | | Fix Wayland plugin to work with Wayland after some interfaces changedJørgen Lind2011-01-252-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | such as wl_display_create -> wl_display_connect wl_surface_attach (attributes) wl_surface_map -> wl_surface_map_toplevel wl_shell_listener wl_output_listener
| | * | | | | Make QGLContext::fromPlatformGLContext show correct sharingJørgen Lind2011-01-254-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information. Prior to this, if a context was created with QGLWidget it would setup the sharing correct, but all sharing actually created on a QPlatformGLContext level was ignored by the QGLContext, thus indicating that it wasnt sharing with any other context.
| | * | | | | Remove Lighthouse specific code from QGLWindowSurfaceJørgen Lind2011-01-251-7/+1
| | | | | | |
| | * | | | | Fix X11 clipboard bug.Jørgen Lind2011-01-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truth be told, the x11 clipboard integration in testlite was done rather quickly, thus leaving some cornercases open
| | * | | | | Fix for uninitialized member in QWaylandCursorRolf Offermanns2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch Qt applications will crash the moment the mouse pointer enters the window. Signed-off-by: Rolf Offermanns <roffermanns@sysgo.com>
| | * | | | | wayland: use pkgconfig for libdrm in wayland.proBenjamin Franzke2011-01-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On this system the IncludePath for drm.h was missing So maybe pkgconfig should be additionally also used for libxkbcommon, EGL and GLESv2 to prevent such problems. but i dont know whether its common to use pkg-config in qmake
| | * | | | | wayland: remove non-public header from config.testsBenjamin Franzke2011-01-251-2/+1
| | | | | | |
| | * | | | | wayland: fix SOURCES to point to wayland.cpp in config.testsBenjamin Franzke2011-01-251-1/+1
| | | | | | |
| | * | | | | Wayland: request rbg and premultiplied argb visuals as neededJesse Barnes2011-01-253-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating DRM buffers we should try to match the visual type requested with the buffer format.
| | * | | | | Wayland: clamp window resizes to screen sizeJesse Barnes2011-01-251-3/+13
| | | | | | |
| | * | | | | Wayland: split GL code into separate filesJesse Barnes2011-01-256-290/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For clarity and to prevent merge conflicts etc. in future.
| | * | | | | Wayland: use correct viewport for swapBuffers and correct coordsJesse Barnes2011-01-251-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're drawing into the parent, so we need to use the parent's geometry for the GL viewport, or we may not be able to draw it. We also need to use the parent width & height when checking whether to normalize to 1.0 or -1.0 in the coord transform calculations.
| | * | | | | Wayland: fix geometry of swapBuffersJesse Barnes2011-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the geometry isn't mapped 1:1 we need to divide the bottom by height, not width, to calculate the texture rectangle.
| | * | | | | Wayland: clean up swapBuffers codeJesse Barnes2011-01-251-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull the swap fbo and rbo into the context and make sure to destroy them when the context goes away. Add unfortunate lazy allocation of the fbo and rbo because we need them to be part of the right context.
| | * | | | | Wayland: add GL widget supportJesse Barnes2011-01-252-4/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we copy from the private surface into the parent surface at swapBuffers time.
| | * | | | | Wayland: set parent window pointer in setParent()Jesse Barnes2011-01-252-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll need this to handle GL widgets.
| | * | | | | Wayland: render to a texture, not a renderbufferJesse Barnes2011-01-253-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will let us source from offscreen GL widget surfaces and copy into the parent surface.
| | * | | | | Wayland: put context & drawing objects into the drm surfaceJesse Barnes2011-01-253-28/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even GL widgets will allocate window surfaces, so share everything there. This still leaves a hole when we mix GL widgets and the raster back end (the created platform GL context won't have a DRM buffer to use for its objects & context), but that won't work right now anyway...
| | * | | | | Wayland: add partial GL widget supportJesse Barnes2011-01-254-46/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GL widgets need a platform GL context. Add one to get hellogl_es2 limping along.
| | * | | | | Wayland: add waylandgl platform typeJesse Barnes2011-01-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will set mUseOpenGL when -platform waylandgl is passed to clients.
| | * | | | | Wayland: silence unused variable warnings in qwaylandinputdevice.cppJesse Barnes2011-01-251-0/+7
| | | | | | |
| | * | | | | Wayland: add GL drawing supportJesse Barnes2011-01-254-32/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Works with analogclock, draws upside down, fails to resize, and doesn't show GL widget with hello_es2.
| | * | | | | Wayland: misc cleanupsJesse Barnes2011-01-252-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unused variables, debug output.
| | * | | | | Introduce drm wayland bufferKristian Høgsberg2011-01-254-40/+151
| | | | | | |
| | * | | | | Initialize EGLKristian Høgsberg2011-01-253-31/+142
| | | | | | |
| | * | | | | Cursors, keyboard support, move/resizeKristian Høgsberg2011-01-257-87/+426
| | | | | | |
| | * | | | | Use QImage::Format_ARGB32_Premultiplied for the surfaceKristian Høgsberg2011-01-251-1/+1
| | | | | | |
| | * | | | | wayland: Track the QWaylandWindow in the input device instead of the surfaceKristian Høgsberg2011-01-251-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The surface is destroyed when the window is hidden, so we can't use that for looking up the widget to send events to.
| | * | | | | wayland: Assign a window id to wayland windowsKristian Høgsberg2011-01-252-0/+10
| | | | | | |
| | * | | | | wayland: Create and destroy surface at show and hideKristian Høgsberg2011-01-254-10/+35
| | | | | | |
| | * | | | | wayland: Split input device out to its own fileKristian Høgsberg2011-01-254-163/+185
| | | | | | |
| | * | | | | Add wayland lighthouse pluginKristian Høgsberg2011-01-2510-0/+870
| | | | | | |
| | * | | | | Add Qt::Key_ScreenSaverPaul Olav Tvete2011-01-181-0/+1
| | | | | | |
| | * | | | | Configure: allow -no-framework for lighthouse.Morten Johan Sørvig2011-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (configure has trouble separating host and target platforms.)
| | * | | | | Lighthouse: Fix keyboard on testliteJørgen Lind2011-01-072-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove code which was wrong