summaryrefslogtreecommitdiffstats
path: root/src/plugins/graphicssystems
Commit message (Collapse)AuthorAgeFilesLines
...
| * Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface ↵Michael Dominic K2010-12-081-1/+8
| | | | | | | | | | | | | | already created. Merge-request: 967 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-128-52/+191
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Coding style: bang cleanup.Michael Dominic K2010-11-111-10/+10
| | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Removed call to glFinish, obsoleted by fence syncs.Michael Dominic K2010-11-111-1/+0
| | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Plugin-side support for creating/destroying/waiting on fence sync.Michael Dominic K2010-11-114-13/+49
| | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Added MeeGo graphicssystem entry points for KHR_fence_sync.Michael Dominic K2010-11-112-2/+76
| | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Trailing whitespace fixes.Michael Dominic K2010-11-113-15/+15
| | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| |
| * Doc: Fixing typoSergio Ahumada2010-11-091-2/+2
| |
| * Doc: Fixing typoSergio Ahumada2010-11-031-3/+3
| |
| * Use 32bit textures for alpha textures after all.Michael Dominic K2010-11-022-2/+21
| | | | | | | | | | | | | | 4444 16bit are too bad quality-wise. Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * One more fix for dithering.Michael Dominic K2010-11-021-8/+8
| | | | | | | | | | Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * 32bit => 16bit conversion has 4byte-aligned output.Michael Dominic K2010-10-291-4/+15
| | | | | | | | | | Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-292-4/+13
|\ \ | |/
| * Do not support QImage::Format_ARGB32 in meego gfx for egl images.Michael Dominic K2010-10-281-2/+1
| | | | | | | | | | | | | | It was a bug/mistake to support that. Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Use QVarLengthArray to store accumulator data.Michael Dominic K2010-10-281-2/+12
| | | | | | | | | | Merge-request: 2499 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2610-239/+817
|\ \ | |/ | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * Doc: Fixing typoSergio Ahumada2010-10-251-3/+3
| |
| * For meego graphics system, use floyd-steinberg dithering when converting to ↵Michael Dominic K2010-10-223-24/+278
| | | | | | | | | | | | | | 16bit. Merge-request: 2496 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Adding ::scroll capabilities to live pixmaps.Michael Dominic K2010-10-212-3/+70
| | | | | | | | | | Merge-request: 2494 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-217-232/+334
| | | | | | | | | | | | | | Moving code from qmeegopixmapdata there. Merge-request: 2494 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * In meego, support Format_RGB32 too for eglShared images.Michael Dominic K2010-10-211-2/+3
| | | | | | | | | | Merge-request: 2493 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * In meego graphics system remove a redundant check.Michael Dominic K2010-10-181-1/+1
| | | | | | | | | | Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Removing glFinish calls in eglSharedImage code. Not needed anymore.Michael Dominic K2010-10-181-10/+0
| | | | | | | | | | | | | | (was a driver bug after all). Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * ::copy on the QMeeGoPixmapData creates a raster-backed pixmap.Michael Dominic K2010-10-185-2/+124
| | | | | | | | | | | | | | Was required to implement a new subclass to make this happen. Merge-request: 863 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-132-5/+13
| | | | | | | | | | Merge-request: 856 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Correctly remove the egl alpha surface flags in meego graphics system.Michael Dominic K2010-10-131-1/+3
| | | | | | | | | | Merge-request: 856 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Proper dither & proper alpha checking.Michael Dominic K2010-10-131-4/+4
| | | | | | | | | | Merge-request: 854 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * In meego graphics system, use always 16bit textures.Michael Dominic K2010-10-131-8/+40
| | | | | | | | | | | | | | Use GL_RGB16 for no-alpha images and RGBA4 for alpha images. Merge-request: 854 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-227-0/+310
|\ \ | |/ | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3Jason Barron2010-10-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | S^3 does not have a client side API to support semi-transparent EGL surfaces so if this flag is enabled for a particular widget, then we should return a raster surface instead of a VG surface. Raster surfaces can still be semi-transparent but will be slower to render to. Task-number: QTBUG-14400 Reviewed-by: Jani Hautakangas Reviewed-by: Gareth Stockwell Reviewed-by: Sami Merila
| * Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-076-0/+302
| | | | | | | | | | Merge-request: 848 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2710-0/+957
|\ \ | |/ | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * Qt headers must be included before X11 headersBenjamin Poulain2010-09-211-3/+3
| | | | | | | | | | | | | | X11 symbols are conflicting with some of the Qt ones. Qt headers needs to be included before the X11 ones in order to compile on Maemo. Reviewed-by: Samuel Rødal
| * Fixed compilation of MeeGo graphics system without eglext.hSamuel Rødal2010-09-171-1/+0
| | | | | | | | | | | | We don't rely on this header, so there's no need to include it. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * Fixed missing background for regular Qt applications with MeeGo system.Samuel Rødal2010-09-141-1/+0
| | | | | | | | | | | | | | | | Setting NoSystemBackground means that top-level widget backgrounds don't get painted any more. Another work-around must be found to prevent flickering. Reviewed-by: Gunnar Sletta
| * Use QFactoryLoader to ensure we get the correct graphics system plugin.Samuel Rødal2010-09-101-8/+8
| | | | | | | | Also, this prevents hard-coding the path to the meego plugin.
| * Updated license headers for meego graphics system.Samuel Rødal2010-09-108-56/+272
| |
| * Fixed compilation and API of meego graphics system.Samuel Rødal2010-09-1010-148/+153
| |
| * Renamed meego graphics system files.Samuel Rødal2010-09-109-0/+0
| |
| * Imported meego graphics system sources.Samuel Rødal2010-09-109-0/+738
| | | | | | | | From http://www.gitorious.com/meego-graphics/meego-graphics
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-261-0/+2
|\ \ | |/ | | | | | | | | | | Conflicts: src/opengl/opengl.pro src/opengl/qgl.cpp src/opengl/qgl_p.h
| * Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-201-0/+2
| | | | | | | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
* | Removed createBlittable factory function from PlatformIntegrationJørgen Lind2010-07-224-185/+0
| | | | | | | | | | | | | | | | | | | | and moved it onto QBlittablePixmap making the class abstract. The creator function was seen as to spesialised to be part of the PlatformIntegration class, and belonged to the QBlittablePixmap class anyway since that was the PixmapData type you would need to return to use the blitter api. Also removed the cross platform examples as they are more confusing than anything else. For usage of QBlittable look in the directfb platform integration plugin.
* | Adding -qpa configure switchJørgen Lind2010-06-241-5/+1
| | | | | | | | also renaming the embedded_lite qmake switch to be qpa
* | Say hello to Q_WS_QPA!Jørgen Lind2010-06-241-1/+1
| | | | | | | | Rename Q_WS_LITE -> Q_WS_QPA
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-101-3/+11
|\ \ | |/ | | | | | | | | Conflicts: src/gui/egl/egl.pri src/gui/painting/qwindowsurface_p.h
| * Enable QX11GLWindowSurface using "-graphicssystem x11gl" optionTom Cooksey2010-04-261-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the OpenGL graphics system is in X11GL mode, it will use the QX11GLWindowSurface for all widgets except QGraphicsViews with the FullViewportUpdate update mode set, where it will use the regular QGLWindowSurface, as this is probabbly faster. QX11GLWindowSurface differs from QGLWindowSurface because it allows accelerated scrolling and partial updates, while still being using opengl to do rendering. Task-number: QT-280 Task-number: QT-2625 Reviewed-By: Trond