summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* document QString::fromUtf16() slownessOswald Buddenhagen2010-02-011-0/+11
|
* remove duplicated calculation of lengthOswald Buddenhagen2010-02-011-1/+1
|
* remove pointless conditionalsOswald Buddenhagen2010-02-011-3/+2
| | | | | | | we already know that (endian == DetectEndianness) - we tested it 1 resp 3 lines above ... Reviewed-By: denis
* micro-optimizationOswald Buddenhagen2010-02-011-1/+1
| | | | | move up the headerdone setting, so the compiler can do tail-merging of the branches
* optimize qhash()Oswald Buddenhagen2010-02-011-4/+4
| | | | | | | | | on any modern architecture, an 1 out of 16 times needlessly executed shift (even if a long one) and xor are less expensive than a pretty much randomly 1 out of 16 times differently taken conditional jump. so simply remove the conditional. ~15% faster on Core2. Reviewed-by: joao
* Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-013-8/+8
| | | | | Fix spelling errors, foreach()/QString usage, explicit constructors. Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2813-31/+29
|\ | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Put the correct images with the D-Bus and Embedded Linux sections. Call cheaper clear() instead of assigning new QString() Fix some foreach usage to use const refs googlesuggest example: Add newline to end of file Core classes, examples, demos: Some changes from string to char Fix header labels on mac with rtl
| * Call cheaper clear() instead of assigning new QString()Markus Goetz2010-01-284-19/+19
| | | | | | | | | | Reviewed-by: joao Reviewed-by: Peter Hartmann
| * Fix some foreach usage to use const refsMarkus Goetz2010-01-285-6/+6
| | | | | | | | Reviewed-by: joao
| * Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-283-4/+4
| | | | | | | | Reviewed-by: Peter Hartmann
| * Fix header labels on mac with rtlJens Bache-Wiig2010-01-281-2/+0
| | | | | | | | | | | | | | | | | | The removed code simply reduces the size of the rect when running with RightToLeft without compensating anywhere else. It seems to be a leftover from a previously removed piece of code. Reviewed-by: richard Task-number: QTBUG-6882
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-283-3/+44
|\ \ | |/ |/| | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix a regression: icons with slightly wrong ICO header did not load. Fixed an endless loop if printing web pages. don't build unneeded QtDesigner parts on Windows CE Better support for user-generated binary shaders
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-2865-465/+1572
| |\
| | * Fixed an endless loop if printing web pages.Trond Kjernåsen2010-01-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Entering a page range which is valid, but outside of the printable range would result in an infinite loop. Task-number: QTBUG-6051 Reviewed-by: Simon Hausmann
| | * Better support for user-generated binary shadersRhys Weatherley2010-01-271-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user provided their own shader with glShaderBinary(), QGLShaderProgram::addShader() would refuse to add it because it wasn't marked as "compiled". According to the OpenGL/ES 2.0 specification: "It is permissible to attach a shader object to a program object before source code has been loaded into the shader object or before the shader object has been compiled." Based on this, the compile check has been removed from addShader() which should make supporting binary shaders easier. Similarly, link() and programId() have been modified to support applications that use glProgramBinaryOES() to specify program binaries. Task-number: QTBUG-7490 Reviewed-by: Tom Cooksey
| * | Fix a regression: icons with slightly wrong ICO header did not load.Jan-Arve Sæther2010-01-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression was introduced by commit fd9cdaa55da455b90eacec571aeb2c84fa55f7e0. Also fix a completely broken autotest that didn't actually test anything. Task-number: QTBUG-7688 Reviewed-by: Alexis
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2832-186/+333
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (70 commits) doc: Fixed the last qdoc errors. doc: Document the "Type" enum value as a const in variable. Designer: Add lower/raise to context menu. Compile with no-webkit - add missing semi-colons. Fixes visibility update missing when doing setParentItem on graphicsitem Stabilize tst_QGraphicsScene::polishItems2 (new test) Fixed an infinite loop that could occur when reading invalid BMP images. Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. ...
| * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-285-8/+31
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-os1Prasanth Ullattil2010-01-285-8/+31
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp
| * | | | doc: Fixed the last qdoc errors.Martin Smith2010-01-282-8/+13
| |/ / /
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2833-546/+807
| |\ \ \
| | * | | Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-273-36/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setParentItem is causing the previous opacity/visible updates to be discarded because the dirty flags were not propagated to the new parent. Also removed some unnecessary 'markDirty' and 'update' calls. Task-number: QTBUG-6738 Reviewed-by: bnilsen
| | * | | 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
| | * | | Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-271-0/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Added optimization flag to QGraphicsItemPrivate.Samuel Rødal2010-01-272-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid traversing the whole child hierarchy when opacity changes unless there are children with graphics effects. Reviewed-by: Bjørn Erik Nilsen
| | * | | Fixed child items with graphics effects not inheriting opacity.Samuel Rødal2010-01-272-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to invalidate the graphics source pixmap cache for both child items and parent items when changing the opacity of a graphics item. Reviewed-by: Bjørn Erik Nilsen
| | * | | Small optimization in raster paint engine.Samuel Rødal2010-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't repeatedly update the pen / brush if no pen / brush is set. Reviewed-by: Gunnar Sletta
| | * | | Another ASSERT while deleting spansGabriel de Dietrich2010-01-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That rare case when we are deleting the last span was not being taken care of. Unbelievable but true. Auto-test included. Reviewed-by: Thierry Reviewed-by: leo Task-number: QTBUG-6004
| | * | | 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>
| | * | | Potential crash when adding items from QGraphicsWidget::polishEvent().Bjørn Erik Nilsen2010-01-272-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were processed immediately, so there was a fair chance that we could end up doing a virtual function call on items that were not fully constructed. This patch is also an optimization, since we never remove anything from the vector. Auto-test included. Reviewed-by: Jan-Arve
| | * | | QGraphicsWidget is painted twice on the inital show.Bjørn Erik Nilsen2010-01-273-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem occured when doing something in the polishEvent() which eventually ended up as an update(). The problem was that in QGraphicsScene::addItem we scheduled a polish event after scheduling an update, resulting in update requests being processed before polish requests. Auto-test included. Task-number: QTBUG-6956 Reviewed-by: alexis
| | * | | Fix QPainter::redirection() to pass autotest.Gunnar Sletta2010-01-271-3/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| | * | | 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
| | * | | Fix y-inverted pixmaps properly.Gunnar Sletta2010-01-271-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-271-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-271-2/+0
| | | | |
| | * | | Fix documentation bug in QColorGunnar Sletta2010-01-271-7/+4
| | | | |
| | * | | Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.Bjørn Erik Nilsen2010-01-273-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-275-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-271-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-271-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-273-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
| | * | | 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
| | * | | Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-271-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-275-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-271-6/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Samuel
| | * | | Doc fixes: Remove some lies from QEasingCurve.Jan-Arve Sæther2010-01-271-3/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7418
| | * | | Don't use a mutex lock in QPainter::redirection unless strictly requiredGunnar Sletta2010-01-271-3/+36
| | | | |
| | * | | Fix how we select antialiasing method for text under Mac OS XGunnar Sletta2010-01-271-15/+31
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil
| | * | | Mac: Calling showFullScreen() then showNormal() on a widget results in top ↵Carlos Manuel Duclos Vergara2010-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | menu hiding. The problem here was the way we entered Full Screen Mode. We were using "kUIModeAllSuppressed" which does the following according to the manual: kUIModeAllSuppressed All system UI elements (including the menu bar) are hidden. However, these elements may automatically show themselves in response to mouse movements or other user activity. I changed it to "kUIModeAllHidden", which does the following: All system UI elements (including the menu bar) are hidden. To prevent a change of behavior I added the following option to the SetSystemUIMode: kUIOptionAutoShowMenuBar This flag specifies that the menu bar automatically shows itself when the user moves the mouse into the screen area that would ordinarily be occupied by the menu bar. Only valid for the presentation mode kUIModeAllHidden. Task-number: QTBUG-7625 Reviewed-by: Richard Moe Gustavsen
generated by cgit v0.12 at 2024-12-03 01:36:06 (GMT)