summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set serial number in QX11PixmapData::transformedAnders Bakken2010-01-071-0/+2
| | | | | | | | QX11PixmapData::transformed initializes a new QX11PixmapData object but doesn't set its serial number. Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit eb94abb952114e826e02ba4562d9048e77f46644)
* Reset the OpenVG scissor after a native painting call-outRhys Weatherley2010-01-071-2/+11
| | | | | | Task-number: QTBUG-7051 Reviewed-by: Daniel Pope (cherry picked from commit fbccab463a8bd77d66adb9f96a67037f73f0019d)
* Fix background brush for character format when writing to ODF document.Pierre Rossi2010-01-072-1/+12
| | | | | | Task-number: QTBUG-7047 Reviewed-by: Benjamin Poulain (cherry picked from commit 51c4571caf5d5ffb2545106df47d7c399b3e228b)
* Avoid deep QImage copies in the OpenVG paint engineRhys Weatherley2010-01-072-9/+12
| | | | | | Task-number: QTBUG-7015 Reviewed-by: Daniel Pope (cherry picked from commit b0e7ef2aa62a123b51920b8f0a08af07a9cd9d09)
* doc: Clarified next and previous activation order.Martin Smith2010-01-071-8/+8
| | | | | Task-number: QTBUG-6992 (cherry picked from commit 049f65b4d07587e26c69602e6e59682e82948bd2)
* Fixed a copy-paste error in QRasterPixmapData::metric().Trond Kjernåsen2010-01-071-1/+1
| | | | | | | | | Calling metric() to get the device height in mm of a pixmap when using the raster engine would actually return the width.. Task-number: QTBUG-6985 Reviewed-by: Carlos Duclos (cherry picked from commit 4bd7e6930fcd9e04696aa5426691cd90ba383a32)
* doc: Fixed typo.Martin Smith2010-01-071-1/+1
| | | | | Task-number: QTBUG-6978 (cherry picked from commit fee4ec0c8f507fae4f6795f43dca1333f46c9922)
* Fixes painting artifacts when using CacheBackground in a QGraphicsView.Yoann Lopes2010-01-071-1/+2
| | | | | | | | | | | The problem was that when the background cache was invalidated, it was entirely recreated but only the exposed area of the view was repainted in it, causing the cache to be partly empty in some cases. Now the background cache is always fully repainted when it is invalidated. Task-number: QTBUG-6935 Reviewed-by: ogoffart (cherry picked from commit 2600fd42117913b427d07e510724b0ea5e355205)
* doc: Replaced usses of rootState() with state machine pointer.Martin Smith2010-01-071-2/+2
| | | | | | | The root state of a QStateMachine is now the state machine itself. Task-number: QTBUG-6907 (cherry picked from commit 553e0cafa578ece64c07afa11571eca4c7b9444c)
* Fixes crash when widget with WA_StaticContents child become toplevel.Olivier Goffart2010-01-072-7/+34
| | | | | | | | | | | | | Happens for example if a DockWidget is undocked and has a child whith the WA_StaticContents attribute. The parent does not change (so newParent is false) but still, the top level widget change. So staticWidget need to be moved to the new backingstore. Reviewed-by: Benjamin Poulain Task-number: QTBUG-6883 (cherry picked from commit 03baad51d584778a99f4b393232ccc1312db3391)
* BitsPerSample should default to 1 in TIFF files.Rhys Weatherley2010-01-071-4/+3
| | | | | | Task-number: QTBUG-6870 Reviewed-by: Lorn Potter (cherry picked from commit f019f3cf807e3c804bba3ef5598ea69adbb39e8b)
* doc: Added note explaining grabMouse() for Cocoa and Carbon.Martin Smith2010-01-071-4/+10
| | | | | Task-number: QTBUG-6810 (cherry picked from commit 190f45bcc7383bdc68a904e7dd5780372d00afba)
* doc: Added some missing macro descriptions.Martin Smith2010-01-071-4/+27
| | | | | Task-number: QTBUG-6769 (cherry picked from commit 94c2fce09c34b629a6fcb5a9576c4646a1ac24a8)
* doc: Clarified that the scene owns its items and destroys them.Martin Smith2010-01-071-11/+17
| | | | | Task-number: QTBUG-6637 (cherry picked from commit 9cdeb6ca14713891a14f24e97adb59b0d3b682fd)
* doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-071-3/+4
| | | | | Task-number: QTBUG-6615 (cherry picked from commit 9bb45b19789910aff5e2a972a1ced758814fac31)
* Implement QScript::QObjectDelegate::getOwnPropertyDescriptorOlivier Goffart2010-01-074-1/+164
| | | | | | | | This is needed for the fix for QTBUG-5749 that follow Reviewed-by: Kent Hansen Task-number: QTBUG-5749 (cherry picked from commit d14ac9914753220e54f3b5cd94d122325d499776)
* QScript: Lookup the native setter from the prototypeOlivier Goffart2010-01-071-1/+9
| | | | | | | | | | | | | | | | | Usefull if we have 'native' properties with setter in a prototype This happen if you use a QObject wrapper as a prototype. Use getPropertyDescriptor that look up the prototype in order to know if we have a setter. Note that we cannot relly on PropertDescriptor::isAccessorDescriptor as the Getter or Setter attributes are not necesserly updated correctly when updating properties. (See the workaround QScriptValuePrivate::propertyFlags, and tst_QScriptValue::getSetProperty with object7) Task-number: QTBUG-5749 (also need the previous patch) Reviewed-by: Kent Hansen (cherry picked from commit e715a7f4cfad454b9c966fa2938cbe9a92ce49fb)
* Fixed QGLWidget::renderText().Trond Kjernaasen2010-01-073-109/+13
| | | | | | | | | | | | Fall back and use the GL 1 engine for the renderText() functions. Getting it to work with the GL 2 engine is a futile effort. Making it work with renderPixmap() in the GL 2 engine is not possible at all, since software contexts in general do not support shader programs. Task-number: QTBUG-5002, QTBUG-6931 Reviewed-by: Kim (cherry picked from commit 5394052c422f7087263ad6dc6d6a4448b4c4afba)
* Fix QT_NO_CONTEXTMENUKent Hansen2010-01-061-0/+2
| | | | | Task-number: QTBUG-6474 (cherry picked from commit e8b3defc466fff9110ee00b6e730d405cde52abc)
* doc: Added an explanatory \note about the table being sorted.Martin Smith2010-01-061-2/+12
| | | | | Task-number: QTBUG-5046 (cherry picked from commit 65a0c8cc6d2c13cfb2cef22e8a23f4e3050fde25)
* Updated sis file names and related content in Symbian installation docsMiikka Heikkinen2010-01-062-12/+24
| | | | | | Task-number: QTBUG-6348 Reviewed-by: Janne Koskinen (cherry picked from commit 44f7b73940c67b8e81f52dfc6370453ff07d3aa2)
* Fixed Symbian application deployment instructionsMiikka Heikkinen2010-01-062-7/+3
| | | | | | | | Obsolete sis files were referenced. Task-number: QTBUG-6601 Reviewed-by: Janne Koskinen (cherry picked from commit 66275bc468339ec2599ba660b728304858e30b39)
* Update license headers to release versionJason McDonald2010-01-068785-114335/+114337
| | | | Reviewed-by: Trust Me
* Remove the need to know the service owner when adding/removing signal rules.Thiago Macieira2010-01-064-34/+21
| | | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe (cherry picked from commit 06bdf48e9194d73075041efecde5c70a144d6927)
* Use the watched service name list in matching incoming signals too.Thiago Macieira2010-01-061-2/+8
| | | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe (cherry picked from commit 200413f08334574108fdb07efaa7648f90209a8f)
* Change the QtDBus watched service list to a map to its owner.Thiago Macieira2010-01-062-17/+48
| | | | | | | | | | | | | | Instead of simply counting how many times we're watching a service, also map a service to its owner. This allows us to provide a faster, cached GetNameOwner too. Technically, this could mean that a service that is started in-between event loops could remain invalid for a longer period of time. I'm not sure this is an issue -- will need some testing in KDE. Task-number: QTBUG-5979 Reviewed-By: TrustMe (cherry picked from commit 988decb610ec5e12380c60204878a0b9e2aaeb01)
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-2819-227/+470
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QUrl::toEncoded() fix for the case of "password, but no username". Fix tst_QFileInfo::isHidden_data on Windows QStyleSheetStyle: Fixed some text croped when having padding with native border. Lots of mostly cosmetic cleanups to GL2 paint engine Move the 0.5 offset we add for aliased rendering to updateMatrix() revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| * QUrl::toEncoded() fix for the case of "password, but no username".David Faure2009-12-282-5/+16
| | | | | | | | | | | | | | | | | | | | QUrl::setPassword() without QUrl::setUserName() is actually useful, e.g. for kde's ldap:// slave. QUrl::toString() already handled this correctly, but QUrl::toEncoded() would forget the password in such a case. Autotest added. Merge-request: 2276 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * Fix tst_QFileInfo::isHidden_data on WindowsOlivier Goffart2009-12-281-2/+2
| | | | | | | | Commit d27006b2a853924a11aa2bc45 did not fully revert the test
| * QStyleSheetStyle: Fixed some text croped when having padding with native border.Olivier Goffart2009-12-282-1/+58
| | | | | | | | | | | | | | The native border width need to be taken into account in QRenderRule::boxRect() Task-number: QTBUG-6855 Reviewed-by: Benjamin Poulain
| * Lots of mostly cosmetic cleanups to GL2 paint engineTom Cooksey2009-12-284-138/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move most of drawPixmaps to private * Move most of stroke to private * Remove dead code: context() * Make optimiseForBrushTransform use xform type * Use GLuint for uniform location * Rename lastTexture -> lastTextureUsed * Move qopengl2paintengine_cleanup_vectorpath to private * Re-ordered declarations in header * Remove dead temporaryTransform * Rename use_system_clip -> useSystemClip Reviewed-By: Kim
| * Move the 0.5 offset we add for aliased rendering to updateMatrix()Tom Cooksey2009-12-282-33/+47
| | | | | | | | | | | | | | | | | | | | | | The old code set and unset a temporary matrix for every draw command when doing aliased rendering. Instead, we just use a flag to indicate that updateMatrix() should add the offset. This means the offset is added only once. When doing lots of small rendering operations on a (non-multisampled) QGLWidget, this gives up to 72% performance boost on the SGX. Reviewed-By: Kim
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-2813-55/+221
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-2713-55/+221
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-2613-55/+221
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-2513-55/+221
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| | | | | * revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845Ritt Konstantin2009-12-233-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as discussed at #qt-labs special dirs should be hidden on unix to preserve qt3-like behavior unhiding those dirs was not a good idea and now i do revert of my changes Merge-request: 1894 Reviewed-by: Joerg Bornemann <joerg.bornemann@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
| | | | | |
| | | | | * Docs: Amendments to latest changes to QImageReader docs.Andreas Aardal Hanssen2009-12-231-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Holger Hans Peter Freyther <zecke@selfish.org>
| | | | | * images: Document QImageReader::loopCount behaviour for infinite loopsHolger Hans Peter Freyther2009-12-233-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gif and mng reader will return -1 as QImageReader::loopCount() for infinite images. Document that this -1 is clashing with the error handling of this method. The documentation was mixing the default and error cases. In some cases "Otherwise -1" and "Otherwise 0" was used. Change this to mention the default coming from QImageIOHandler in the "Otherwise" clause and document the error case with -1. Add a test case to check that loopCount() returns -1 for infinite animations. Reviewed-by: Andreas
| | | | | * gif: Add unit test for QImageReader::size callsHolger Hans Peter Freyther2009-12-233-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify that QImageReader::size is not consuming a frame and can be called before each frame and that the last frame will return a QSize of (-1x-1). Task-number: QTBUG-6696 Reviewed-by: Andreas
| | | | | * gif: 10% speedup on microbenchmark on QImageReaderHolger Hans Peter Freyther2009-12-231-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the microbenchmark of what is executed during pure pageloading in regarding to QImageReader this is an improvement. Do not use the non const QImage::scanLine as this will go through the QImage::detach all the time making QImage::scanLine show up in the profile. Introduce a FAST_SCAN_LINE that is doing the scanLine calculation on local variables. Reviewed-by: Andreas
| | | | | * png: Avoid calling QImage::scanLine(int) from within a loopHolger Hans Peter Freyther2009-12-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas
| | | | | * QImageReader: Avoid errorString creation in the normal caseHolger Hans Peter Freyther2009-12-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy the same idiom found in QIODevice::errorString(). Return "Unknown Error" in case of am empty string. This is a tiny improvement for QtWebKit. Reviewed-by: Andreas
| | | | | * Fix text rendering on GL2 paint engineTom Cooksey2009-12-232-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you draw with a brush, then draw a pixmap, then draw with the same brush, the GL2 engine wouldn't update the fragment shader to use the brush. This is because it detected the brush hadn't changed and so didn't need updating. To fix this, we now set the current brush to noBrush when drawing an image/pixmap so the engine knows it needs to update the GL state for the brush. Reviewed-By: Kim
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-282-13/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Using qt.iby no longer requires emulator deployment to be done
| * | | | | Using qt.iby no longer requires emulator deployment to be doneMiikka Heikkinen2009-12-282-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export generated plugin stubs to a known location under epoc32 in all Symbian builds, so that emulator deployment is not the only way to make them available for qt.iby. Task-number: QTBUG-6972 Reviewed-by: Janne Koskinen
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-281-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix D-Bus marshalling of booleans in optimised code.
| * | | | | Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-271-1/+3
| |\ \ \ \ \
generated by cgit v0.12 at 2025-08-18 06:30:40 (GMT)