summaryrefslogtreecommitdiffstats
path: root/src/plugins/gfxdrivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-15/+10
|\ | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Refactor QDirectFBPixmap::fromImage slightlyAnders Bakken2010-03-261-14/+9
| | | | | | | | | | | | | | Clean up the function a little and make sure I don't call QImage::hasAlphaChannel twice for opaque images. Reviewed-by: muthu <qt-info@nokia.com>
| * QDirectFBPixmap can handle NoOpaqueDetection.Anders Bakken2010-03-261-1/+1
| | | | | | | | | | | | | | We don't need to do the conversion using QImage when NoOpaqueDetection is specified. Reviewed-by: muthu <qt-info@nokia.com>
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-155-19/+20
|\ \ | |/ | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * Do qFatal() on unsupported screen format instead of crashing laterPaul Olav Tvete2010-03-101-0/+3
| | | | | | | | | | Task-number: Related to QTBUG-5117 Reviewed-by: Jørgen Lind
| * Compile without QT3_SUPPORTAnders Bakken2010-03-091-2/+2
| | | | | | | | | | | | QList<T>::remove() is QT3_SUPPORT, replace with erase(). Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Improve scrolling in DirectFBAnders Bakken2010-03-092-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Since DirectFB always uses the front buffer of a double buffered surface as the source when blitting we needed to make sure that the front buffer was valid and hence we called Flip for each scroll. This had negative performance impacts since you could end up with various parts of a window being updated at different times. With this patch we store whether the front-buffer is up to date inside the window surface and only call Flip in scroll if it's not. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Don't use DirectFB for non-existing pixmapsAnders Bakken2010-03-081-0/+2
| | | | | | | | | | | | | | DirectFB will print a warning for this since the file doesn't exist but we might as well not try when we know the file doesn't exist. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-063-79/+184
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Compile with DirectFB version >= 1.2.0 && < 1.2.9Anders Bakken2010-03-051-1/+1
| | | | | | | | | | | | DSPF_DST was added in 1.2.9, not in 1.2.0 Reviewed-by: muthu <qt-info@nokia.com>
| * QDirectFBPaintEngine optimizationAnders Bakken2010-03-051-3/+4
| | | | | | | | | | | | | | If you call fillRect(QBrush(QColor())); we should short-circuit before falling back to the raster engine. Reviewed-by: muthu <qt-info@nokia.com>
| * Add some warnings when using DISABLE/WARN in DFBAnders Bakken2010-03-051-4/+19
| | | | | | | | | | | | | | | | If you specify an operation that is not recognized in QT_DIRECTFB_WARN_ON_RASTERFALLBACKS or QT_DIRECTFB_DISABLE_RASTERFALLBACKS Reviewed-by: muthu <qt-info@nokia.com>
| * Support keypad input with vnc driverPaul Olav Tvete2010-03-031-0/+34
| | | | | | | | | | Task-number: QT-1849 Reviewed-by: Jeremy
| * Simplify DirectFB performance debuggingAnders Bakken2010-03-021-16/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | Allow people to control whether or not to warn on/disable raster fallbacks using the following mechanism: export QT_DIRECTFB_DISABLE_RASTERFALLBACKS="draw_pixmap|draw_text" export QT_DIRECTFB_WARN_ON_RASTERFALLBACKS="draw_lines" It's still possible to define QT_DIRECTFB_WARN_ON_RASTERFALLBACKS to something for legacy reasons. The environment variable check is only available in debug mode.
| * Fix licenseCheck autotestOlivier Goffart2010-03-021-1/+1
| |
| * Make composition modes work better for DirectFBAnders Bakken2010-03-011-60/+39
| | | | | | | | | | | | | | | | | | | | It seems that I have to premultiply the colors I pass to IDirectFBSurface->SetColor when composition mode != Source|SourceIn. It now seems to behave the same way as the raster engine which I guess should be considered the authority on this matter. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * Don't disable alpha when filling with opaque colorAnders Bakken2010-03-011-1/+1
| | | | | | | | | | | | | | | | Qt heuristics say that a QPixmap becomes an alpha pixmap when filled with a color with alpha != 255 but not that it returns to being opaque when filled with a color with alpha == 255 Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * Add support for composition mode DSPD_DST in DFBAnders Bakken2010-03-011-0/+5
| | | | | | | | | | | | This porter duff rule was added in DirectFB 1.2 Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-264-45/+73
|\ \ | |/ | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| * Initialize mem to 0Anders Bakken2010-02-241-1/+1
| | | | | | | | | | | | If DirectFB fails to lock a surface it won't necessarily set mem to 0. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Force DSFLIP_BLIT unless it's a full flip in DFBAnders Bakken2010-02-241-1/+12
| | | | | | | | | | | | | | | | If you're only updating parts of a widget we have to make sure DSFLIP_BLIT is included. Otherwise Qt's assumptions about the backing store breaks. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Support for disabling partial flips in dfbAnders Bakken2010-02-242-2/+5
| | | | | | | | | | | | | | | | | | | | Certain boards do not properly support IDirectFBSurface->Flip() with a partial DFBRegion passed in. This problem can be worked around by exporting: QWS_DISPLAY=directfb:nopartialflip Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Allow forcing premultiplied format in DFBAnders Bakken2010-02-241-1/+5
| | | | | | | | | | | | | | This was already possible in non-WM mode. I now enable using the same connect argument to make it work for WM. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Better support tlw transparency in DirectFBAnders Bakken2010-02-242-40/+50
| | | | | | | | | | | | | | | | | | Since we don't have a dedicated function that gets called when isOpaque changes for a window we do not support making an existing window non-opaque at runtime. Supporting this would require considerable overhead per flush and we do not want that. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * Fix an isOpaque bug in QDirectFBWindowSurfaceAnders Bakken2010-02-241-2/+2
| | | | | | | | | | | | The logic was reversed. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-151-0/+11
|\ \ | |/ | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| * Export a function to get dfb-surface from a pixmapAnders Bakken2010-02-101-0/+11
| | | | | | | | | | | | | | This function is only exported when DirectFB is built as part of libQtGui. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Eskil Abrahamsen Blomfeldt2010-02-041-1/+1
|\ \ | |/ | | | | qstatictext-4.6
| * Make DSFLIP_ONSYNC part of the default flip flags.Anders Bakken2010-02-021-1/+1
| | | | | | | | Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* | Lock before calling drawStaticTextItemAnders Bakken2010-02-022-1/+11
|/ | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Implement QDirectFBPixmapData::scrollAnders Bakken2010-01-222-3/+29
| | | | | | This is a very operation in DirectFB and saves a fair bit of overhead. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Fix semitransparent windows with DirectFBAnders Bakken2010-01-211-3/+0
| | | | | | This filling of the window surface is a bug. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0734-34/+34
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| * Update copyright year to 2010Jason McDonald2010-01-0634-34/+34
| | | | | | | | Reviewed-by: Trust Me
* | Make stretchblit an opt-out option in DirectFBAnders Bakken2010-01-042-11/+28
| | | | | | | | | | | | | | | | Certain boards are not support StretchBlit very well. This patch enables them to define QT_NO_DIRECTFB_STRETCHBLIT to fall back to the raster engine for stretchblits. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Set serial number in QDFBPixmapData::transformedAnders Bakken2010-01-041-0/+1
|/ | | | | | | QDirectFBPixmapData::transformed initializes a new QDirectFBPixmapData object but doesn't set its serial number. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Read QWS_SIZE from layer rather than screenAnders Bakken2009-12-231-1/+8
| | | | | | | | | | | When running the X11 emulator of DirectFB IDirectFBScreen->GetSize returns the size of the entire X11 Display, not the actual DirectFB window. We can read this from the primary layer instead and this value is correct both on devices and on the desktop. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Get rid of no_cast_from_ascii warningAnders Bakken2009-12-231-1/+1
|
* Clean up debug message with DirectFBAnders Bakken2009-12-091-29/+29
| | | | | | Remove some superfluous spaces. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Enable customizing of DirectFB layer to useAnders Bakken2009-12-091-2/+5
| | | | | | | | | | | This patch enables you to use a different layer for Qt apps by specifying: E.g. QWS_DISPLAY=directfb:layerid=2 Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Set stacking class for stays-on-top windows in DFBAnders Bakken2009-12-091-1/+3
| | | | | | | | For better compatibility with non-QWS DirectFB apps running in the same session we should set the stacking class of Windows that have the StaysOnTop flag set. This corresponds nicely to DWSC_UPPER. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-191-2/+2
|\
| * Ran the script utils/normalizeOlivier Goffart2009-11-181-2/+2
| | | | | | | | Over src/ tools/ examples/ and demos/
* | Remove DWCAPS_DOUBLEBUFFER in window creationAnders Bakken2009-11-181-1/+1
|/ | | | | | | | This value seems to cause problems on various chipsets and we get a double buffered window regardless. Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit 3bc9a381ebfaf9144120936bb579b71fc7cf29ae)
* API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-093-5/+5
| | | | | | | QRegion::numRects() is marked obsolete. Removed all usage of the old function inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-062-4/+4
| | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-061-1/+1
| | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* Support composition mode source for drawing in dfbAnders Bakken2009-11-061-19/+52
| | | | | | | | | | | Qt's/DirectFB's composition modes are not compatible for drawing operations. We only support SourceOver and handle whether or not to blend colors using DSDRAW_BLEND based on the alpha/opacity value. If drawing with Source and an opaque color we can still handle the operation using DirectFB. This has major impact since WebKit fills the background of web pages using Source. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Reset composition mode after drawing in dfbAnders Bakken2009-11-061-3/+8
| | | | | | | | When drawing primitives in DirectFB we always set composition mode to NONE and manually manage whether or not to blend. This patch makes sure we will reset the composition mode afterwards. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Fix bad merge from 4.5 in powervr codeRhys Weatherley2009-11-061-61/+0
|