summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Marius Storm-Olsen2009-06-301-1/+0
|\
| * 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-261-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
| * Bump Qt version number.Jason McDonald2009-06-251-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | 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
* | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-2212-0/+901
| | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* | 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
* | Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-16131-264/+264
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-16136-272/+272
| | | | | | | | 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-126-12/+78
|\ \ | |/ | | | | | | | | | | | | | | | | 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>
| * Fixed a validation problem in QSvgIOHandler::canRead().Trond Kjernåsen2009-06-081-5/+30
| | | | | | | | | | | | | | | | | | | | QSvgIOHandler::canRead() only looked at the 80 first bytes in a SVG file when looking for the <svg> tag. That tag can obviously be found at an arbitrary offset from the start of the file, depending on e.g. comments tags. Task-number: 255419 Reviewed-by: Kim
* | Add support for TIFF formats (Mono and indexed)Benjamin Poulain2009-06-091-83/+259
| | | | | | | | | | | | | | | | | | | | Add support for reading and writing for Mono, MonoLSB and Indexed images in the tiff format. Previously, the images were always written in RGB32, dismissing the input format. Task-number: 254317 Reviewed-by: Samuel
* | Fix floating point exception in QImageReader::setScaledSize(QSize(0, 0))Leonardo Sobral Cunha2009-06-091-1/+2
| | | | | | | | | | | | | | | | Avoid a division by 0 when doing QImageReader::setScaledSize(QSize(0, 0)) for jpeg formats. Reviewed-by: thierry Task-number: 255627
* | 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-283-5/+5
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Adds support for linking against iodbc on linux.Bill King2009-05-281-7/+1
| | | | | | | | | | | | If unixodbc detection fails, try and link/detect iodbc libraries and link against them. Reviewed-by: Lincoln Ramsay
* | 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'Samuel Rødal2009-05-201-0/+2
|\ \ | |/
| * Make the range controls accessibleHarald Fernengel2009-05-201-0/+2
| |
* | Set the resolution when saving a tiff fileBenjamin Poulain2009-05-191-1/+19
| | | | | | | | | | | | | | | | | | The resolution was not saved when the image was saved as tiff. This fix add the resolution, and try to guess if the user have set it in dpi or dot per centimeter Task-number: 245242 Reviewed-by: Samuel
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-135-15/+14
|\ \ | |/
| * Fixed wrong function name in warningAnders Bakken2009-05-121-3/+3
| | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| * Make QAccessibleLineEdit actually accessibleHarald Fernengel2009-05-121-0/+1
| | | | | | | | Q_ACCESSIBLE_OBJECT was missing
| * 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
| * Improved caching of QSvgIconEngine::actualSize() calls.Trond Kjernåsen2009-05-111-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | If an application calls QIcon::actualSize() for SVG based icons, before the icon is drawn for the first time, the actualSize() call will result in the SVG file being loaded and parsed for each call. Instead of doing that, just render a pixmap of the queried size and then the resulting actualSize() calls will used the size of the cached pixmap. Task-number: related to 251106 Reviewed-by: Kim
* | Merge branch '4.5'Thiago Macieira2009-05-071-10/+2
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp