summaryrefslogtreecommitdiffstats
path: root/src/plugins/gfxdrivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-092-51/+43
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * QDirectFBPaintEngine return if destRect is nullAnders Bakken2009-07-031-0/+2
| | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| * Better debug output for QDirectFBPaintEngineAnders Bakken2009-07-021-2/+5
| | | | | | | | | | | | Add unsupportedCompositionMode to the output. Reviewed-by: TrustMe
| * We still need to Flip in NO_WM modeAnders Bakken2009-07-021-1/+1
| | | | | | | | | | | | This ifdef was simply in the wrong place. Reviewed-by: Donald <qt-info@nokia.com>
| * Make sure we check the right deviceAnders Bakken2009-07-011-2/+2
| | | | | | | | | | | | Also. Make sure to call QRasterPaintEngine::end() Reviewed-by: Donald <qt-info@nokia.com>
| * Code cleanupAnders Bakken2009-07-011-48/+36
| | | | | | | | | | | | | | Move the code from QDirectFBPaintEnginePrivate::(end|begin) into QDirectFBPaintEngine::(end|begin) Reviewed-by: TrustMe
| * Remove superfluous call to SetBlittingFlagsAnders Bakken2009-06-291-1/+0
| | | | | | | | | | | | We already do this in QDirectFBWindowSurface::scroll Reviewed-by: TrustMe
* | Merge branch '4.5'Thiago Macieira2009-06-252-9/+21
|\ \ | |/ | | | | | | | | Conflicts: src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
| * Fix off by one bug in DirectFBPaintEngineAnders Bakken2009-06-241-2/+2
| | | | | | | | | | | | This bug made us call lock more than we needed to. Reviewed-by: Donald <qt-info@nokia.com>
| * Fix a rendering issueAnders Bakken2009-06-242-3/+8
| | | | | | | | | | | | Make sure surfaces always are locked when used as source for something. Reviewed-by: TrustMe
| * Make sure simplePen gets set properlyAnders Bakken2009-06-241-5/+11
| | | | | | | | | | | | | | | | | | The logic regarding whether or not a pen was simple was broken. Essentially the pen is sonly simple if it should en up as a single pixel line. Reviewed-by: Donald <qt-info@nokia.com>
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-232-3/+7
|\ \ | |/ | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| * Minor optimizationAnders Bakken2009-06-221-1/+0
| | | | | | | | | | | | | | No need to set the pen in begin. It's always done before it's used anyway. Reviewed-by: TrustMe
| * Bail out on invalid color in fillRectAnders Bakken2009-06-221-1/+6
| | | | | | | | Reviewed-by: TrustMe
| * Use const ref for foreachAnders Bakken2009-06-221-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Make sure to update is_null in copy/transformedAnders Bakken2009-06-221-0/+3
| | | | | | | | Reviewed-by: TrustMe
* | Code cleanupAnders Bakken2009-06-221-10/+11
| | | | | | | | | | | | Mark the functions that are reimplemented as virtual in declaration. Reviewed-by: TrustMe
* | Fix a couple of issues after QPixmapData optimsAnders Bakken2009-06-184-23/+20
| | | | | | | | | | | | | | | | Make sure we always set w, h and d. See fa8030a935acaacee570eee320e7510a4cfdc853 Reviewed-by: TrustMe
* | Speed up QPixmap::width(), height(), isNull() and depth().Andreas Aardal Hanssen2009-06-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the w, h, d variables to QPixmapData and introduces is_null to keep track of nullness. This is possible only because QPixmapData is internal API; otherwise we'd have to be smarter. The optimization makes the QPixmap::width() function take 7 instructions, down from 34 before. For the calculator demo in the declarative ui branch this reduces a block of 750000 instructions (out of 30000000) to around 100000-150000 instructions. Tested on Windows, Linux, Mac. Raster, X11 and OpenGL paint engines. Have not tested the DirectFB engine. Reviewed-by: Trond
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-1639-80/+80
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1639-78/+78
| | | | | | | | Reviewed-by: Trust Me
| * Get rid of warningsAnders Bakken2009-06-141-2/+2
| | | | | | | | Reviewed-by: TrustMe
* | ControlPointRect is no longer a QRealRectAnders Bakken2009-06-141-1/+1
| | | | | | | | | | | | | | | | s/y2/bottom()/ Compile. Reviewed-by: TrustMe
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-125-7/+48
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * Make DirectFB compile with 0.9.22Anders Bakken2009-06-092-3/+8
| | | | | | | | | | | | | | Some options were added for 0.9.23. This change adds some ifdefs so DFB 0.9.22 compiles Reviewed-by: TrustMe
| * Make the directfb plugin compile against 0.9Anders Bakken2009-06-085-4/+40
| | | | | | | | | | | | | | | | | | | | Not sure to what extent it actually works but atleast it compiles now. - A couple of image formats doesn't exist in 0.9 - IDirectFBSurface::ReleaseSource doesn't exist in 0.9 - IDirectFBWindow::SetBounds doesn't exist in 0.9 Reviewed-by: Donald <qt-info@nokia.com>
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-3/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * Make sure to retain alpha information in copyAnders Bakken2009-06-041-3/+4
| | | | | | | | | | | | We need to set alpha to the right value when copying pixmaps. Reviewed-by: Donald <qt-info@nokia.com>
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-025-194/+81
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * Improve readability of QDFBWindowSurface::scrollAnders Bakken2009-06-011-21/+18
| | | | | | | | | | | | The batch-blits buys us nothing and this is much more readable. Reviewed-by: TrustMe
| * Don't support porter duff |= source overAnders Bakken2009-05-291-96/+24
| | | | | | | | | | | | | | | | DirectFB and Qt treats these things rather differently so the mapping just doesn't work very well. Only use DirectFB for SourceOver stuff (which is the default mode anyway) Reviewed-by: Donald <qt-info@nokia.com>
| * Remove all force raster on RGB32 stuffAnders Bakken2009-05-284-75/+32
| | | | | | | | | | | | | | | | | | Previously we allowed RGB32 but forced fallbacks for all drawing operations. It turns out blitting operations doesn't work right either so we'll rather just disallow this format altogether. See also 36ae58e7a6a888d3ae7bd162d59daada550bbfb1 Reviewed-by: Donald <qt-info@nokia.com>
| * Warn when trying to use an unsupported formatAnders Bakken2009-05-281-5/+10
| | | | | | | | | | | | | | Due to incompatibilities between RGB32 in DirectFB and Qt we can't use RGB32. Reviewed-by: Donald <qt-info@nokia.com>
* | improved string operations all over the placeThierry Bastian2009-05-282-4/+4
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Merge branch '4.5'Thiago Macieira2009-05-221-1/+1
|\ \ | |/
| * Removed warningAnders Bakken2009-05-211-1/+1
| | | | | | | | | | | | Explicitly cast to integer. Reviewed-by: Shane McLaughlin <Shane.McLaughlin@trolltech.com>
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-133-6/+10
|\ \ | |/
| * Fixed wrong function name in warningAnders Bakken2009-05-121-3/+3
| | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| * initialize all DFBSurfaceDescriptions to 0Anders Bakken2009-05-111-1/+6
| | | | | | | | | | | | Since this is C there are no constructors. Reviewed-by: Donald <qt-info@nokia.com>
| * Remove unused variableAnders Bakken2009-05-111-1/+0
| | | | | | | | Reviewed-by: TrustMe
| * Fix a type in warningAnders Bakken2009-05-111-1/+1
| | | | | | | | | | | | QDirecttFBPixmapData => QDirectFBPixmapData Reviewed-by: TrustMe
* | Merge branch '4.5'Thiago Macieira2009-05-071-10/+2
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| * Whitespace fixAnders Bakken2009-05-071-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Use proper ways to create "window" surfaceAnders Bakken2009-05-061-9/+1
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-0615-703/+750
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * Improved debug output for directfb:debugAnders Bakken2009-05-061-6/+10
| | | | | | | | | | | | Include info on the primary surface pixelformat. Reviewed-by: TrustMe
| * Pass the scale parameter as an int.Anders Bakken2009-05-061-1/+1
| | | | | | | | | | | | We're just printout out the integer value anyway. Reviewed-by: TrustMe
| * Make Scale publicAnders Bakken2009-05-061-1/+3
| | | | | | | | | | Needed for fallback warnings Reviewed-by: TrustMe
| * Cleaned up codeAnders Bakken2009-05-051-24/+20
| | | | | | | | | | | | | | | | | | Put all variables in the same area for QDirectFBPaintEnginePrivate. Make QDirectFBPaintEngine a friend. Also, do away with setClipDirty and replace it with d->clipDirty = true; Reviewed-by: TrustMe
| * Cleaned up codeAnders Bakken2009-05-051-439/+443
| | | | | | | | | | | | | | Move private functions to the bottom of the file to be more in line with how most qt cpp files are structured. Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-10-24 13:30:41 (GMT)