summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add preliminary QAccessibleImage interfaceHarald Fernengel2009-11-065-2/+75
| | | | As requested by the Maemo team.
* Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-0633-746/+974
|\
| * Fixed g++ compiler warnings in qpen.cpp.Samuel Rødal2009-11-061-1/+1
| |
| * Fix fuzzy aliased rendering on GLES2Tom Cooksey2009-11-062-2/+13
| | | | | | | | | | | | | | | | | | | | The GL2 paint engine adds a (0.49,0.49) pixel offset when doing aliased rendering. But this assumed if it was doing aliased rendering then multisampling was disabled. On GLES, multisampling is always enabled if the surface has it enabled. So on GLES, we never add the offset if the surface is multisampled. Reviewed-By: Gunnar
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-061-15/+2
| |\
| | * Fix QPainter::setPen(pen with color but no style) on non-extended.David Faure2009-11-061-15/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was working with a QImage but not with a QPixmap, which is obviously a bug. In addition, it broke WebCore::GraphicsContext::setPlatformStrokeColor which does exactly what I put in the unittest: get pen, set color, set pen. This commit fixes the wrong color in the underline of the links in http://www.davidfaure.fr/kde/link_underline_color.html in QtWebkit. Merge-request: 1995 Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-066-147/+181
| |\ \ | | |/ | |/|
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-0611-68/+207
| |\ \
| | * | CompileEskil Abrahamsen Blomfeldt2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Missing comma in qfontdatabase.cpp Reviewed-by: Gunnar
| | * | Fixed crash in qt_scale_image_16/32bit() when target is flipped.Kim Motoyoshi Kalland2009-11-061-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the target rectangle had negative width or height and the target rectangle's border passed through pixel centres, qt_scale_image_16/32bit() could crash because of incorrect rounding. Task-number: 5493 Reviewed-by: Gunnar
| | * | add support for the N'Ko writing system to QtLars Knoll2009-11-064-49/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables N'Ko support in Qt, after having now a harfbuzz version that supports it. Task-number: QTBUG-1042 Reviewed-by: Gunnar
| | * | update harfbuzz once again, adding N'Ko supportLars Knoll2009-11-064-6/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integrate/update to change 797fe54d9ebbafb0cdc00705c008ea09e7ac1e9e from harfbuzz: commit 797fe54d9ebbafb0cdc00705c008ea09e7ac1e9e Author: Lars Knoll <lars.knoll@nokia.com> Date: Fri Nov 6 11:56:44 2009 +0100 add N'Ko support to the arabic shaper Long outstanding bug report for Qt. See http://bugreports.qt.nokia.com/browse/QTBUG-1042 Task-number: part of QTBUG-1042 Reviewed-by: Gunnar
| | * | Fixed uninitialized background artifacts in QWidget::render.Samuel Rødal2009-11-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to use isOpaque to check whether the widget has an opaque background, it's not enough to just check the palette (it doesn't check Qt::NoSystemBackground for example). Task-number: QTBUG-5012 Reviewed-by: Gunnar Sletta
| | * | fix painting on Windows CEMaurice Kalinowski2009-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it seems the timer id ~0 is already used on windows ce or not available at all. This has caused Qt to not receive the timer messages, causing to not update. Task-number: qtbug-5496 Reviewed-by: Gunnar Sletta
| * | | don't do unessesary brush comparrisonsGunnar Sletta2009-11-061-8/+0
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | Revert micro optimization where NoPen == NoBrush as SVG relies on thisGunnar Sletta2009-11-061-3/+1
| |/ / | | | | | | | | | Reviewed-by: Samuel
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-0662-195/+643
| |\ \
| * | | Fixed bad joins in the new stroker... Normal generation was broken.gunnar2009-11-051-4/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trustme
| * | | Fix a bug in malayalam renderingLars Knoll2009-11-052-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated to harfbuzz e6636cadacf220785fca12b741b4587ff1ee42ec. Fixes a bug with the rendering of samvruthokaram (combination of 0xd41 + 0xd4d) in malayalam. Task-number: Parts of QTBUG-1887 Reviewed-by: Eskil
| * | | update harfbuzz to fix assamese shaping bugLars Knoll2009-11-052-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Synced harfbuzz to e66916e33821e71ba19479c32108a2be8bb539b2 Task-number: QTBUG-1802 Reviewed-by: Eskil
| * | | Set strokes as non-convex by default.Gunnar Sletta2009-11-051-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | Use fallback stroker for cosmetic strokes with asymetric transformsGunnar Sletta2009-11-052-3/+14
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | Fix docs for QGLFramebufferObject & add warnings in bind/releaseTom Cooksey2009-11-051-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Warnings are for binding/releasing when the current context isn't in the same context group as the FBO was created in. Reviewed-By: Trond
| * | | Remove unnessisary QGLFBOGLPaintDevice re-implementationsTom Cooksey2009-11-052-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now QGLFBO doesn't do stacking, QGLPaintDevice's base implementation is ok to use. Reviewed-By: Trond
| * | | Fixed crash in QPixmap::resize_helper on mac and x11Gunnar Sletta2009-11-051-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| * | | Don't crash in QStateMachine when event transition listens toEskil Abrahamsen Blomfeldt2009-11-051-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QApplication instance We can't assert on actually watching the watched object, since we may have installed an event filter on QApplication::instance(), in which case we will filter events for all objects. Reviewed-by: Gunnar
| * | | Removed the FBO stacking behaviour and the test attached to it.Trond Kjernåsen2009-11-052-28/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Having this behaviour in QGLFrameBufferObject complicates alot of things and isn't really necessary. Reviewed-by: Tom Cooksey
| * | | Fixed soft-light composition mode in raster and OpenGL1.Kim Motoyoshi Kalland2009-11-053-351/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the soft-light composition mode implementation in the raster and OpenGL1 engines to use the equations in the SVG specification as of April 2009. Task-number: QTBUG-3193 Reviewed-by: Trond
| * | | Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-055-168/+205
| | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | | Fixed some debug and some minor optims to QPaintBuffergunnar2009-11-042-40/+60
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Made QPen== catch QPen(Qt::NoPen) == QPen(QBrush(Qt::NoBrush))gunnar2009-11-041-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QSvgDocument uses the latter as default pen so every svg filling command would issue a penChange without this. Reviewed-by: TrustMe
| * | | Added some helpful info to QBrush and QPen's QDebug operatorsgunnar2009-11-042-2/+34
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | Move the check for HWND to be right after the CreateWindow() callAndy Shaw2009-11-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By moving the check, it ensures that the error message obtained if it fails is correct and not the error message that SetWindowLong() gives due to an invalid HWND. Merge-request: 1910 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-066-147/+181
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge commit 'origin/4.6' into large-file-supportJoão Abecasis2009-11-067-97/+83
| |\ \ \
| | * | | 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>
| * | | Merge commit 'origin/4.6' into large-file-supportJoão Abecasis2009-11-052077-27124/+90031
| |\ \ \
| * | | | Updating documentation to reflect actual behaviorJoão Abecasis2009-11-041-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFile::seek is supposed to work on Windows CE with FILE* streams. size() returns 0 on errors and sequential files. Probably on empty files as well ;-) Reviewed-by: Olivier Goffart
| * | | | Further fixes to file size handling on Windows with fd and FILE*João Abecasis2009-11-041-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filelength is not available on Windows CE instead, we must fallback to fseek/ftell as was being done previously. Still on Windows CE, we still don't report the file size for file descriptors, but we also won't set a random error string. Changed qt_error_string calls to use errno when errors come from CRT functions. Also, if we're using filelength on FILE* streams, there's no reason not to use it for file descriptors, instead of requesting a native handle. Reviewed-by: Olivier Goffart
| * | | | Don't try to mmap past EOFJoão Abecasis2009-10-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac OS, mmap would succeed, returning a valid pointer, but trying to read from it would result in a SIGBUS. By adding this check we commit to a safe cross-platform behavior users can depend on. Reviewed-by: Thiago Macieira
| * | | | Fix silly error in bit fiddlingJoão Abecasis2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's what I get for not having the brain on when accepting suggestions... Reviewed-by: Thiago Macieira
| * | | | Fix QFile::isSequential on WindowsJoão Abecasis2009-10-231-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When not using native HANDLEs, the return of isSequential was hardcoded to true for files with a fd, and for the standard FILE* streams stdin, stdout and stderr; false for all other FILE* streams. We now use the native GetFileType call for all files by obtaining a native handle where required. We also treat files of type FILE_TYPE_CHAR as sequential, as is the case for the standard streams in console applications. When standard streams are redirected to/from files, GetFileType will return FILE_TYPE_DISK for them and they won't be considered sequential. This is alright since in this mode they behave like regular files and QFile::seek() will work for random offsets. Reviewed-by: Marius Storm-Olsen
| * | | | On Windows, report a 0 file size for streams and other funny filesJoão Abecasis2009-10-231-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obtain file size directly, instead of relying on fseek/ftell and messing with the file position. Also changed the return value on errors to 0. This is mostly relevant on streams and pipes, where we used to return whatever error value ftell returned (usually -1). This change also makes the return value consistent with what is returned on Unix platforms and what we document for Windows CE. Nevertheless, documentation of this and related issues is misleading and needs to be updated. Reviewed-by: Markus Goetz
| * | | | Check for non-zero return from fseekJoão Abecasis2009-10-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While POSIX specifies a -1 return on error, on Windows only non-zero is documented for error conditions. All platforms agree that zero is returned on success so we check for that instead. Reviewed-by: Markus Goetz
| * | | | Get file position when attaching an open file descriptor to QFileJoão Abecasis2009-10-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was already being done when attaching to FILE* streams. Doing the same here makes the API consistent and more usable. Namely, one can use QFile::pos() to obtain the file position. Test case verifies this doesn't break support for sequential files. More thorough test case included in large file support test. Reviewed-by: Thiago Macieira
| * | | | Fixes some issues with large files in 32-bit systemsJoão Abecasis2009-10-212-2/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira
| * | | | (Windows) Don't create a file mapping for each view that is mappedJoão Abecasis2009-10-213-62/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating a file mapping for each view mapped to memory is sub-optimal and slow. With this change, a single mapping is created and reused when mapping subsequent views of the file. The handle returned from CreateFileForMapping (used in WinCE 5) is now discarded, since the kernel manages it automatically with the file mapping. This simplifies use of the deprecated map API. Reviewed-by: Maurice Kalinowski Reviewed-by: Marius Storm-Olsen
| * | | | Fix 32/64-bit issues with QFile::map/unmap() on *nix systemsJoão Abecasis2009-10-212-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would previously silently ignore overflows in 32-bit systems and not properly support 64-bit offsets in systems that support it because of integer overflow. There was also a problem that could prevent unmap from succeeding, because we were passing the wrong length argument. Task-number: QT-1594 Reviewed-by: Thiago Macieira
* | | | | Removed the unnecessery loop in the last commit originated from a mergeDenis Dzyubenko2009-11-061-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request. Reviewed-by: Prasanth