summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix y-inverted pixmaps properly.Gunnar Sletta2010-01-281-9/+5
| | | | | | | | | | | | There is a lot of code depending on that pixmaps are flipped upside down in the gl graphicssystem, so toggling this requires extensive testing. Since we're anyway questioning the relevance of this feature (compared to raster + GL viewport) its simply not worth the effort to fix it properly right now. Revert "Fixed y-inverted pixmaps on N900." This reverts commit 57473d5d2a7bd6ae3117f61ff29264a1b790bb01.
* Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-281-0/+3
| | | | | | | | Need to bind the PMV matrix's attributes to their indexes in the simple shader, which is created in a seperate code path to all the other shaders. This should fix the qgl autotest failures. Reviewed-By: TrustMe
* removed a debug traceThierry Bastian2010-01-281-2/+0
|
* Fix for symbian dialog background transparency.Jani Hautakangas2010-01-286-7/+63
| | | | | | | If Avkon components support transparency then dialog background is transparent enabling rounded corners. Reviewed-by: Sami Merila
* Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.Bjørn Erik Nilsen2010-01-283-20/+28
| | | | | | | | | | | | | | | QmlGraphicsItem doesn't need any parent change notifactions so we can call the helper class (QGraphicsItemPrivate::setParentItemHelper) direclty from QmlGraphicsItem::setParentItem. This avoids a lot of unnecessary instructions related to QVariant constructions as well as virtual function calls. I've made the variant pointers explicit in the declaration of setParentItemHelper so that we don't accidentally call setParentItemHelper from places where we need parent change notifications. Task-number: QTBUG-6877 Reviewed-by: alexis
* Pass value as const void *const to QGraphicsSceneIndex::itemChange.Bjørn Erik Nilsen2010-01-285-12/+12
| | | | | | | | | We need this change in order to bypass some of the QVariant itemChange notifications from QGraphicsItem::setParentItem. All this is internal stuff and we know what we do, so I don't consider the change too ugly. Task-number: QTBUG-6877 Reviewed-by: alexis
* Optimize QGraphicsItem::setFlags.Bjørn Erik Nilsen2010-01-281-9/+21
| | | | | | | | | We don't have to do a full blown QGraphicsItem::setFlag call from QGraphicsItem::setFlags, only to change the ItemStacksBehindParent bits. We can do it directly (with care). Task-number: QTBUG-6877 Reviewed-by: alexis
* Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helperBjørn Erik Nilsen2010-01-281-4/+4
| | | | | | | | Make sure we do cheap tests before the more expensive ones. This function is called from QGraphicsScene::addItem. Task-number: QTBUG-6877 Reviewed-by: alexis
* Improve performance of QGraphicsItem::setParentItem.Bjørn Erik Nilsen2010-01-283-35/+62
| | | | | | | | | The biggest optimization here is "updateAncestorFlags()". It's much faster to update all the flags rather than trying to enable/disable certain flags according to the current state. Task-number: QTBUG-6877 Reviewed-by: alexis
* Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-281-333/+357
| | | | | | This makes GLSL dumps _significantly_ easier to read. Reviewed-By: TrustMe
* Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-285-31/+42
| | | | | | | | | | | | | | This has several advantages: First, updating an attribute value seems to be cheaper than updating a uniform. Second, vertex atribute values are independent of shader program, which means they persist across changing of the shader program. This makes code simpler and reduces GL state changes. Note: Credit goes to Samuel for finding this little gem. :-) For the 25920 solid QGraphicsRectItem test case, this gives 10% improvement on desktop and 27% on the SGX. Reviewed-By: Kim
* Remove unnecessary depth uniform from GL2 engine's GLSLTom Cooksey2010-01-281-6/+0
| | | | Reviewed-By: Samuel
* Doc fixes: Remove some lies from QEasingCurve.Jan-Arve Sæther2010-01-281-3/+3
| | | | Task-number: QTBUG-7418
* Don't use a mutex lock in QPainter::redirection unless strictly requiredGunnar Sletta2010-01-281-3/+36
|
* Fix how we select antialiasing method for text under Mac OS XGunnar Sletta2010-01-281-11/+31
| | | | Reviewed-by: Eskil
* add directories with sources to list of project rootsOswald Buddenhagen2010-01-286-3/+132
| | | | | | | | | if the pro file for the translations lives in a sibling tree of the actual source tree, messages from included headers wouldn't have been collected, as they were not considered part of the project. Task-number: QTBUG-7495 (cherry picked from commit f300f5cfdf3b32e687191b071c30e14ac2721fc8)
* add -codecfortr optionOswald Buddenhagen2010-01-281-2/+17
| | | | | this has always been kind of an omission ... (cherry picked from commit 2a8fd7584590016dbe22fb74f440e71a2578dc81)
* sanitize lupdate's behavior regarding SUBDIRS projectsOswald Buddenhagen2010-01-2841-94/+592
| | | | | | | | | | | | | | | | | | | | | | | | | | | previously, the semantics of nesting projects were pretty bizarre: the list of TS files grew ever as the subdirs were visited. the source files otoh were cleared for every project. this meant that some TS files were updated over and over again, each time with different data. this is obviously total nonsense, so there is no compatibilty to keep. so here come the new semantics: - each project is scanned separately. it has separate include paths and may override the inherited CODECFORSRC. - the messages from all sub-projects are merged - if a sub-project has a TRANSLATIONS entry, it is "detached" from its parent project, thus starting an own merged translator. it is also possible to name an empty set of TS files to simply exclude the sub-project. - CODECFORTR can be specified in each project with TRANSLATIONS - if TS files are specified on the command line, they override TRANSLATIONS from the top level project and stop processing of detached projects alltogether. if multiple top-level projects are specified, they are all merged. this is somewhat slower, as now includes are re-scanned per project, while previously all sources were simply accumulated and scanned as one project. this can be fixed retroactively if needed. (cherry picked from commit b62b87d6ae3ced4466c1a1b085b51cec757e24f5)
* absorb cmdline tests into "good" structureOswald Buddenhagen2010-01-286-42/+4
| | | | (cherry picked from commit df9a6a9bf9d7bf3609ac034e705d076b82572333)
* unshare pro post-processing codeOswald Buddenhagen2010-01-285-216/+73
| | | | | | lrelease needs only the TRANSLATIONS value anyway, so there is hardly anything to share for real (cherry picked from commit b0a454fd09e0cbf74304aabd160ea25c2c83b4b9)
* fix bogus warning messageOswald Buddenhagen2010-01-281-4/+1
| | | | (cherry picked from commit d74f8fd8d7d378bbf23872ddc24ddfbfd948e295)
* still complain if only ts files where specified on the cmdlineOswald Buddenhagen2010-01-281-7/+7
| | | | (cherry picked from commit 20c871370727630b83adce1e96ac0437802c433a)
* do not sort the TS filesOswald Buddenhagen2010-01-282-3/+1
| | | | | really no point in doing so ... (cherry picked from commit d97a3e97f54d1e1d028fd7bc2b46171c6b0be966)
* Added support for embedded sis name/uid patching for SymbianMiikka Heikkinen2010-01-281-1/+20
| | | | | | | | | | | | Patch_capabilities.pl script now also patches any embedded sis file entries in pkg to embed corresponding *_selfsigned.sis instead. Also the script now removes dependencies to other packages from patched pkg to reduce unnecessary warnings about missing dependencies when said dependencies were installed via patched sises. Reviewed-by: Janne Koskinen (cherry picked from commit 0b2bde7af1ec6cec5c1bc674c9049b12fe0deb20)
* Added a selfsigned version of sqlite3.sisMiikka Heikkinen2010-01-281-0/+0
| | | | | Reviewed-by: TrustMe (cherry picked from commit c513782f7cbad45b7c91e069ae81552a4bbb2a5f)
* QComboBox drawn incorrectly in RightToLeft modeSami Merila2010-01-281-5/+7
| | | | | | | | | | QS60Style does not regard layout orientation when calculating subrects for QComboBox. This leads to a situation where button is not visible on UI with RightToLeft orientation. Task-number: QTBUG-7584 Reviewed-by: Alessandro Portale (cherry picked from commit 78bb23107d9fcde431cd2ba83c1a9e9886b6d51a)
* Make sure cursor is painted at the correct position when we are using IM.Jan-Arve Sæther2010-01-272-2/+8
| | | | | | | | | | When the line edit was refactored into a line control this regression was introduced. This regression was introduced by change fb7d86cf23227302d48db279ec589221d11a1f6a. Task-number: QTBUG-4789 Reviewed-by: Alan Alpert (cherry picked from commit 06ee48f7ad7f5ab8bdbaed765d301fa2c0b417fb)
* Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.Trond Kjernåsen2010-01-271-0/+10
| | | | | | | | | | Modal Mac/Carbon dialogs do not have the close, minimize and resize window title buttons enabled, which makes it very hard to close modal dialogs. Task-number: QTBUG-7481 Reviewed-by: Kim (cherry picked from commit c8f4319b3a2ddacacd3bca67861a41e22dd1ada0)
* Fix documentation bug in QColorGunnar Sletta2010-01-271-7/+4
| | | | (cherry picked from commit 03c77ad02d5a3c69f4edfdfd2f3ef7cd7dc67aaa)
* Fixed an infinite loop that could occur when reading invalid BMP images.Trond Kjernåsen2010-01-271-1/+1
| | | | | | Task-number: QTBUG-7530 Reviewed-by: Kim (cherry picked from commit 0a3ce6fa04ed2b085fe72b89d302a3a5f9e82948)
* Implement QDirectFBPixmapData::scrollAnders Bakken2010-01-272-3/+29
| | | | | | | This is a very operation in DirectFB and saves a fair bit of overhead. Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit e5e6d9e7fe8f5c3baa5caf609198db1184f59ef9)
* QFileDialog layout issue on Symbian (part2)Sami Merila2010-01-271-0/+1
| | | | | | | | Added missing #include. Task-number: QTBUG-6371 Reviewed-by: Alessandro Portale (cherry picked from commit 8c29bbe3dcd192024d2dbfcf2faa72077b77107d)
* QFileDialog layout issue on SymbianSami Merila2010-01-271-0/+18
| | | | | | | | | | If long path (or any other long string) is added to a combobox, it grows outside of screen area. QS60Style needs to check that widget will not grow wider than screen area. Task-number: QTBUG-6371 Reviewed-by: Alessandro Portale (cherry picked from commit e571e0f012e3e27ffff56493755999da1960318c)
* RadioButtons/Checkboxes should have theme highlightSami Merila2010-01-271-0/+65
| | | | | | | | | | | | Currently only keypad navigation focus is drawn to RadioButtons and CheckBoxes in non-touch devices. However, in S60 the native widgets have themed highlight (similar to lists). This task will add that highlight support for these widgets regardless if keypad navigation is active or not. Task-number: QTBUG-5536 Reviewed-by: Alessandro Portale (cherry picked from commit ce64d3c7e0b93fa6792513f804b42d31acccc68e)
* QListView::setAlternatingRowColors is not workingSami Merila2010-01-271-4/+21
| | | | | | | | | | | | | | | QS60Style does not really support alternating line/cell backgrounds. This is due to that no such thing exists on native side and we are using a graphical theme image as list/table background. For style, we'll use QPalette::Light with some transparecy to achieve this. Light is guaranteed to have good contrast with theme background as it is derived from QPalette::Button, which is calculated from button graphics, which *should* be used on top of theme background. Task-number: QTBUG-5980 Reviewed-by: Alessandro Portale (cherry picked from commit 7bbd14b371fe6d931b0c65b00bf36f3b9a2ac33c)
* QListWidget itemActivated does not follow S60 conventionsSami Merila2010-01-274-1/+12
| | | | | | | | | Set StyleHint SH_ItemView_ActivateItemOnSingleClick inactive for 3.x and 5th edition S60. Task-number: QTBUG-6182 Reviewed-by: Alessandro Portale (cherry picked from commit 9bb9991b7c6182249cbf922e4718e1c64e3c6433)
* QS60Style: Combobox button is not drawn pressedSami Merila2010-01-271-75/+35
| | | | | | | | | | | | Currently S60Style ignores the pressed down state when drawing the combobox button. This is due to button drawing picking up wrong QStyleOption (just initialized, no correct style data applied). Greatly simplified toolbutton drawing and fixed the combobox to use correct QStyleOption. Task-number: QTBUG-6950 Reviewed-by: Alessandro Portale (cherry picked from commit 60db8ffc35b9e798fc2c24087a8d56736321d03b)
* S60Style: Add support for animations to style (part2)Sami Merila2010-01-251-0/+1
| | | | | | | | Missing #include added to avoid build break. Task-number: QTBUG-4050 Reviewed-by: Alessandro Portale (cherry picked from commit 7b8b83d2ea788e73a4c0f7dee09ba3394787e6bb)
* S60Style: Add support for animations to styleSami Merila2010-01-256-31/+464
| | | | | | | | | | | Add support of theme animations to AVKON-based QS60Style. Currently only QProgressBar's have animations, but adding others with same kind of S60 theming (mainly note animations) would be really easy to do. Task-number: QTBUG-4050 Reviewed-by: Alessandro Portale (cherry picked from commit 4f9666da561b317729964a402c3f05309778fe90)
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-224-7/+7
|\ | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant docs: Fix link. QtHelp docs: Fix illegal namespace name. Assistant: Set correct mime type for text documents.
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-224-7/+7
| |\ |/ / | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant docs: Fix link. QtHelp docs: Fix illegal namespace name. Assistant: Set correct mime type for text documents.
| * Assistant docs: Fix link.ck2010-01-211-1/+1
| | | | | | | | | | Task-number: QTBUG-4607 Reviewed-by: David Boddie
| * QtHelp docs: Fix illegal namespace name.ck2010-01-212-2/+2
| | | | | | | | | | Task-number: QTBUG-5908 Reviewed-by: kh1
| * Assistant: Set correct mime type for text documents.ck2010-01-211-4/+4
| | | | | | | | | | Task-number: QTBUG-6796 Reviewed-by: kh1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2220-43/+116
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslSocket: Take better care on how we use the SSL buffers Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 ) Revert "Make an empty QUrl also be considered non-detached (d == 0)." SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLF doc: Documented the return value for QDomNode::appendChild(). QNAM HTTP: make it give some better error messages in case of socket failure. qUncompress: Fix terminating \0 Add qttracereplay.exe to gitignore Fix missing focus rect for check and radio buttons in some GTK+ themes
| * | QSslSocket: Take better care on how we use the SSL buffersMarkus Goetz2010-01-211-3/+23
| | | | | | | | | | | | | | | | | | .. and breaking out of a loop where we should. Reviewed-by: thiago
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-214-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | ( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 ) Changes in WebKit/qt since the last update: * Girish: Fix positioning of ComboBox popup in QGraphicsWebView. -- https://bugs.webkit.org/show_bug.cgi?id=33887
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2113-30/+41
| |\ \
| | * | Revert "Make an empty QUrl also be considered non-detached (d == 0)."Thiago Macieira2010-01-212-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | as agreed with Warwick. This reverts commit 089ee7094eabb2058b478f5d2f306a69f6c0b3bf.
| | * | SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLFThiago Macieira2010-01-215-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the file/data ends in the END CERTIFICATE line without a newline, the certificate is still valid. If it's followed by anything other than a newline, then it's no longer valid. Also add another test for the BEGIN CERTIFICATE ending without newline, to ensure we don't crash there either. Reviewed-By: Peter Hartmann
generated by cgit v0.12 at 2024-11-18 07:16:57 (GMT)