summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-05151-1130/+8585
|\
| * Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-033-5/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (237 commits) Fix animation tests after merge Remove duplicated test. Add missing test file. Changing width of RTL positioner doesn't relayout Fix TextInput auto test failure on mac. PinchArea and Flickable don't work well enough together Do not set focus unnecessarily at window activation in Symbian QS60Style: Regression in drawing dialog background QS60Style: Support menu separator (pt.2) Fix auto test failure. Support for new softkey in Symbian^3 Once Image sourceSize is set there is no way to clear it. Rotation transform with NaN angle can cause crash QSoftkeyManager auto test update Fixed not switching to MeeGo graphicssystem. Canceling image download while reading causes crash Fix width of TextInput micro focus rectangle. Return correct boundaries reasons from QTextBoundaryFinder. GridView jumps to beginning of list when resized Fixed rounding of coordinates pre-transformation in CG paintengine. ...
| | * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-313-5/+14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-311-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed not switching to MeeGo graphicssystem. Fixed rounding of coordinates pre-transformation in CG paintengine. Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.
| | | | * Fixed not switching to MeeGo graphicssystem.Samuel Rødal2011-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If two windows become maximized at once we might not switch, this is an attempt at fixing that. Reviewed-by: Armin Berres
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-291-1/+11
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMeeGoLivePixmapData: Verify dimensions of locked pixmap
| | | | * QMeeGoLivePixmapData: Verify dimensions of locked pixmapSami Kyostila2011-03-281-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a switch from HW rendering to SW rendering is done, all EGL surfaces backing a live pixmap become invalid because EGL is terminated. Thanks to a recent patch, all live images are now automatically invalidated when SW rendering is activated. Even with this mechanism in place, it is possible for the underlying EGL surface to be different than what the live pixmap is expecting. This can happen, for instance, if the X pixmap gets destroyed and a different X drawable is created using the same XID. Even though this is an unlikely scenario, it can result in a complete system failure if the surface dimensions do not match and the live pixmap user ends up writing over internal graphics driver structures. This patch adds a safeguard which disallows locking EGL surfaces with non-matching dimensions. Fixes Harmattan bug NB#237138. Merge-request: 2583 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-281-3/+2
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update changes for 4.7.3 directfb: avoid version dependency by setting DSPD_DST blend functions manually fix -enable-stdcall-fixup usage Report that an update is needed if no update was done
| | | | * directfb: avoid version dependency by setting DSPD_DST blend functions manuallyDenis Oliver Kropp2011-03-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2558 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
| * | | | Modified pvrqwswsegl.c to make PowerVR work for processors using flipbuffer ↵Arun Voleti2011-04-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chain Merge-request: 1083 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | | | Check that pixmap is not null before accessing itPauli Nieminen2011-04-011-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QMeeGoGraphicsSystem::createPixmapData is called with origin raster pixmap data holding null image would result to null pointer deference when trying to fetch data pointer. To avoid the crash at graphics system switch pixmap data should be checked if it is NULL. Fixes: NB#237972 Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Merge-request: 1160 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-244-14/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-232-10/+13
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes QT-4753
| | | * Fixes QT-4753Xizhi Zhu2011-03-232-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | Invalid read in ICD plugin for bearer management. Reviewed-by: Iiro Kause
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-222-4/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Implement tiled image and pixmap drawing in VG paint engine. Changed maximum heap size for qmlflickr on Symbian. Change Symbian to use destroyed swap behaviour in GL Remove useless profile reference.
| | | * Remove useless profile reference.axis2011-03-222-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The profile has been empty since the plugin functionality was moved into QtMultimedia itself (d73df73c556b0a225fdde7341549ed834bc691f4). RevBy: Miikka Heikkinen
| | * | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-213-15/+225
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.7.4
| | * | | Bump Qt version to 4.7.4Timo Turunen2011-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-22142-1108/+8543
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp
| | * \ \ \ Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-222-6/+19
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro Added setSwitchPolicy to MeeGo graphicssystem helper API. Add /q switch to QMAKE_DEL_FILE command in symbian
| | | * \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-192-6/+19
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-182-6/+19
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added setSwitchPolicy to MeeGo graphicssystem helper API.
| | | | | * | | Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-182-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets the application control whether or not automatic switching should be used, and also to completely disable switching if desired. Reviewed-by: Armin Berres
| | * | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-191-1/+38
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Changes to driver workarounds. Switch to raster also when last window is destroyed (on MeeGo). Fix accidental population of the disk cache with partial content Fix disk cache interaction for range retrieval HTTP requests. Clipboard/Windows: Fix a hang when sending to non-responsive clients.
| | | * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-181-1/+38
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-171-1/+38
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Changes to driver workarounds. Switch to raster also when last window is destroyed (on MeeGo). Clipboard/Windows: Fix a hang when sending to non-responsive clients.
| | | | | * | | Switch to raster also when last window is destroyed (on MeeGo).Samuel Rødal2011-03-171-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will save GPU resources for applications that are in the background for most of the time and only show a window now and then. Reviewed-by: Armin Berres
| | * | | | | | Fixes detected by the static-checkJørgen Lind2011-03-173-3/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This included added a license header on a moc file. Its nasty, but has to stay like that until we have a better sollution for generating moc files on uikit
| | * | | | | | Fixup license headers in Lighthouse pluginsJørgen Lind2011-03-17101-113/+441
| | | | | | | |
| | * | | | | | Don't skip remaining events on unhandled events in xcb backend.Samuel Rødal2011-03-171-2/+6
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1768-88/+292
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| | * | | | | | Lighthouse: Xcb, compile fix for the glx pathJørgen Lind2011-03-161-0/+2
| | | | | | | |
| | * | | | | | Compile.Morten Johan Sørvig2011-03-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect the system-zlib QT_CONFIG setting. Reviewed-by: Jørgen Lind
| | * | | | | | Properly set the window event masks etc for screens and GL windows too.Samuel Rødal2011-03-152-3/+5
| | | | | | | |
| | * | | | | | Fix race condition in the non-GL casePaul Olav Tvete2011-03-143-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to also flush output when waiting for an ack from the compositor, in case we haven't sent the frame request yet. Reviewed-by: Jørgen
| | * | | | | | Do release build for devices and remove some warnings.con2011-03-114-31/+42
| | | | | | | |
| | * | | | | | XmlPatterns actually compiles and runs.con2011-03-101-2/+2
| | | | | | | |
| | * | | | | | Add proof-of-concept UIKit based lighthouse platform.con2011-03-1021-0/+2082
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the README in the uikit platform plugin for details.
| | * | | | | | Lighthouse: Adding Native interface to getting the native eglcontextJørgen Lind2011-03-079-17/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in xcbplugin. I also reoredered how eglInitialize was executed, (its not so lazy anymore)
| | * | | | | | Lighthouse: Fix a block for wayland with gl supportBenjamin Franzke2011-03-041-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initialial readable iteration, needs to be done before initializing egl, or it will be done inside egl. The readable iteration after initialzing egl would block forever otherwise.
| | * | | | | | Lighthouse: Make xcb backen usable for anyone else againJørgen Lind2011-03-031-1/+4
| | | | | | | |
| | * | | | | | Compile with glxPaul Olav Tvete2011-03-022-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen
| | * | | | | | Build fixes for the Wayland pluginPaul Olav Tvete2011-03-023-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qmake.conf variables, and use the generic font plugin. Reviewed-by: Jørgen
| | * | | | | | Lighthouse: Implement the new Native Interface api in the xcb pluginJørgen Lind2011-03-014-16/+87
| | | | | | | |
| | * | | | | | added capabilites to QPlatformIntegrationGunnar Sletta2011-03-0114-3/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
| | * | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-0118-146/+401
| | |\ \ \ \ \ \
| | * | | | | | | Lighthouse: Xcb, implement native interfaceJørgen Lind2011-03-015-2/+82
| | | | | | | | |
| | * | | | | | | Lighthouse: Xcb. implement dri2 context handlingJørgen Lind2011-03-017-25/+460
| | | | | | | | |
| | * | | | | | | Lighthouse: Adding EGL support to the xcb pluginJørgen Lind2011-03-0110-33/+90
| | | | | | | | |
| | * | | | | | | Lighthouse: Xlib added QXlibDisplay typeJørgen Lind2011-03-0112-144/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still use the nativeDisplay all over the place. Maybe we should?
generated by cgit v0.12 at 2025-03-10 09:54:07 (GMT)