summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add a new qconfig feature GESTURESTasuku Suzuki2010-06-0248-9/+216
| | | | | Merge-request: 535 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* Don't remove the pixmap from cache when not modifying it.Andreas Aardal Hanssen2010-06-011-2/+4
| | | | | | | | Fixes one minor regression in the last commit to QGraphicsIten::scroll: if the expose region doesn't intersect with the cache pixmap, then there's no point in removing it. Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-06-0124-179/+382
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-015-77/+143
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixed a typo Doc: QAbstractItemModel: note unexpected behavior with beginMoveRows Added environment variable graphicssystem switch. Fixed a problem where QPixmaps where re-bound in non-sharing contexts. Fix bug in QGraphicsItem::scroll() when called with no QRectF argument. Make sure we don't pull inn /usr/X11 stuff in the qws mkspek conf Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().
| | * Doc: QAbstractItemModel: note unexpected behavior with beginMoveRowsJohn Brooks2010-06-011-40/+52
| | | | | | | | | | | | | | | | | | | | | | | | The meaning of the destinationChild parameter differs when moving down in the same parent, contrary to statements by the previous docs. Reviewed-by: Olivier Goffart Merge-Request: 600
| | * Added environment variable graphicssystem switch.Andreas Hartmetz2010-06-011-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | Add environment variable switch for graphicssystem so a default can be set at runtime without passing a command-line parameter. Merge-request: 622 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * Fixed a problem where QPixmaps where re-bound in non-sharing contexts.Trond Kjernåsen2010-06-012-20/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you have two non-sharing GL contexts and try to draw the same QPixmap in both of them, they will wind up competing for a spot in the texture cache. Make the context group a part of the cache key to avoid that. Task-number: QT-3462 Reviewed-by: Kim
| | * Fix bug in QGraphicsItem::scroll() when called with no QRectF argument.Andreas Aardal Hanssen2010-06-011-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a null rect argument, QGraphicsItem::scroll() is supposed to scroll the whole item. When using ItemCoordinateCache, currently the only supported mode for scroll optimization, we simple scrolled the whole cache pixmap. Problem: The cache pixmap has a border of 2 pixels. So we scroll the contents _and_ the border. This leaves white/transparent horizontal and vertical line artifacts when scrolling. This change unifies the two cases - partial and full scrolling - into one (shorter) approach that works without scrolling the margin as well. Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| | * Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().Andreas Aardal Hanssen2010-06-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItem::scroll() scrolls the cache pixmap when cacheMode is enabled (for ItemCoordinateCache only). Because the pixmap exists both in the cache and in a temp QPixmap copy, the ref count is 2, so the scroll operation has to do a deep copy. To avoid this, we remove the pixmap from the cache before and reinsert it again after calling QPixmap::scroll(). Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| * | Documentation.Michael Brasser2010-06-011-1/+16
| | |
| * | Optimization for sci file loading.Michael Brasser2010-06-011-2/+3
| | | | | | | | | | | | Reviewed-by: Martin Jones
| * | Ensure text color set by S60 input method works for QML ItemsMartin Jones2010-06-011-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and QGraphicsWidgets. For QGraphicsWidgets use palette as per QWidget. For QML items leave the color unset so that the default pen is used. Task-number: QTBUG-10997 Reviewed-by: Sami Merila
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-0138-263/+356
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-0138-262/+355
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-017-78/+134
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix example code and image Fix doc Fix some bugs in the QML Web Browser buttons Fix zoom bug in QML Web Browser demo Fix Typo Various doc fixes and improvements Document issues with rectangle border width of 1 where clipping is used Simplify selection setting. Make TextInput more like TextEdit.
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-313-226/+174
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-317-77/+133
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Various doc fixes and improvements Document issues with rectangle border width of 1 where clipping is used Simplify selection setting. Make TextInput more like TextEdit.
| | | | * | | | Fix TypoAlan Alpert2010-05-311-1/+1
| | | | | |/ / | | | | |/| |
| | | | * | | Various doc fixes and improvementsBea Lam2010-05-312-14/+34
| | | | | | |
| | | | * | | Document issues with rectangle border width of 1 where clipping is usedBea Lam2010-05-311-2/+14
| | | | | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-318-8/+39
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4
| | | | * | | Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4Simon Hausmann2010-05-318-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate https://trac.webkit.org/changeset/60435 - [Qt] Escape backslashes in the .pro files by Ossi.
| | * | | | | Fix positionAt when autoScroll is use.Warwick Allison2010-06-011-1/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Task-number: QTBUG-11054
| * | | | | Avoid refilling view during model change.Martin Jones2010-06-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The view position is reset to 0 after clear()ing, but this results in refill() being called, effectively undoing the clear(). Fix is to make the model invalid before resetting position. Task-number: QTBUG-11105
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-314-61/+85
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-318-38/+63
| | |\ \ \ \
| | * | | | | Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-314-61/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By making selectionStart/End read-only, and adding adding select(). Task-number: QTBUG-11056
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-3199-1176/+3215
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Repaint all text when Ctrl+A is pressed in TextEditMartin Jones2010-05-311-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextControl::updateRequest() with empty rect means update all. Task-number: QTBUG-11013
* | | | | | | Speed up QStaticText with affine transformation on GL2 engineEskil Abrahamsen Blomfeldt2010-06-015-45/+58
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the OpenGL2 paint engine supports transforming the prerendered glyphs rather than rasterizing the glyphs with the transformation applied, we don't need to recalculate the QStaticText layout whenever the transformation changes. This means that we can do fast animated transforms for QStaticText on this paint engine. A quick test yields something like 100x speed-up on Windows. This also give visually better results, as we previously would animate the hinting of the glyphs, thus causing jittering. The autotest has been updated to reflect the fact that drawText() and drawStaticText() now go through identical paths on GL, also when transforms are set on the painter. However, the scale was changed in one test, because it was so great that drawText() would fall back to paths. With QStaticText the idea is speed, so you'll get a poor, but fast result instead, which is better than tricking people. Reviewed-by: Samuel
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-3125-11/+93
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits) Doc: Fixed an off-by-one error in an example. Fix QT_NO_TEXTHTMLPARSER Fix QT_NO_DOM Fix QT_NO_TEXTSTREAM compilation errors. Fix QT_NO_VALIDATOR compilation. Doc: Removed a misleading sentence about a class constructor. Doc: correcting docs in QDrag::exec Doc: Adding note about QDrag::exec() Revert behavior of QTextLayout::boundingRect() when line width is set Fix unreasonably large width of QTextLayout::boundingRect() Doc: replacing old image Fix compilation with stricts compilers. Fix QT_NO_DIRMODEL build error in QtDeclarative. Revert "Added native key support to QSharedMemory API." Revert "Improved documentation for QSharedMemory's key/setKey functions." Fix a simple mistake in QXmlStreamReader::atEnd() docs. Improved documentation for QSharedMemory's key/setKey functions. Added native key support to QSharedMemory API. Make test work with shadow builds again. Doc: Corrected the documentation about the compression threshold. ...
| * | | | | Fix QT_NO_TEXTHTMLPARSERTasuku Suzuki2010-05-312-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 644 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | Fix QT_NO_DOMTasuku Suzuki2010-05-312-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2395 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | Fix QT_NO_TEXTDATE compilation errors.Andreas Aardal Hanssen2010-05-315-1/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 649 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | * | | | | Fix QT_NO_TEXTDATETasuku Suzuki2010-05-255-1/+16
| | | | | | |
| * | | | | | Fix QT_NO_TEXTSTREAM compilation errors.Tasuku Suzuki2010-05-317-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 647 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | | Fix QT_NO_VALIDATOR compilation.Tasuku Suzuki2010-05-313-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 648 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | | Doc: correcting docs in QDrag::execMorten Engvoldsen2010-05-311-1/+1
| | | | | | |
| * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Morten Engvoldsen2010-05-311-1/+2
| |\ \ \ \ \ \
| | * | | | | | Revert behavior of QTextLayout::boundingRect() when line width is setEskil Abrahamsen Blomfeldt2010-05-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change 817469519a784b1cc84f89cb3cb84f7560874f8e, there was a behavioral change which can cause regressions, as the bounding rect of the QTextLayout would previously return the set line width when this was greater than the calculated natural text width. We revert to this behavior to avoid regressions and add an autotest for it. When the line width is not set (and si.width is equal to QFIXED_MAX), then we will still return the natural text width. Reviewed-by: Lars
| | * | | | | | Fix unreasonably large width of QTextLayout::boundingRect()Eskil Abrahamsen Blomfeldt2010-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no lineWidth is set on the QTextLine, the QScriptLine::width will be the maximum value that can be represented by QFixed, thus always overriding the width of the bounding rect. The lineWidth of the QTextLine should never be used as the width of the bounding rect, since it's not a calculated value. The real bounding rect is found by querying the natural text width. Task-number: QTBUG-11104 Reviewed-by: Rhys Weatherley
| * | | | | | | Doc: Adding note about QDrag::exec()Morten Engvoldsen2010-05-311-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding note to the QDrag::exec docs alerting the user about Windows speciffic behaviour. Task-number: QT-640
| * | | | | | Fix QT_NO_DIRMODEL build error in QtDeclarative.Tasuku Suzuki2010-05-313-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> Merge-request: 652 Merge-request: 652 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | | Revert "Added native key support to QSharedMemory API."Andreas Aardal Hanssen2010-05-316-104/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9b4ff3deb28b3d642dc4480207f2f23841cf26e9.
| * | | | | | Revert "Improved documentation for QSharedMemory's key/setKey functions."Andreas Aardal Hanssen2010-05-311-37/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 26f3dbf0e20dbaf131bbbb35440b1ecb40b3f405.
| * | | | | | Fix a simple mistake in QXmlStreamReader::atEnd() docs.Robin Burchell2010-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 655 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | | Improved documentation for QSharedMemory's key/setKey functions.Andreas Aardal Hanssen2010-05-311-27/+37
| | | | | | |
| * | | | | | Added native key support to QSharedMemory API.Mirko Damiani2010-05-316-58/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods setNativeKey() and nativeKey() were added to QSharedMemory API. Shared memory's native key is returned by nativeKey() and it is set with either setKey() or setNativeKey(). setKey() leads to a native key that is platform independent while setNativeKey() directly sets the native key without any mangling. When using setNativeKey(), key() returns a null string and shared memory's system semaphore is not set. This means that is up to the user to define a such protection mechanism (i.e. lock() can't be used on native keys). QSharedMemory tests were updated. Merge-request: 1497 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-313-226/+174
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix multithreaded use of bearer management on Symbian. Fix up cancelling of active object. Fix locking after merge from Qt Mobility.
| * | | | | | Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-05-3167-436/+1074
| |\ \ \ \ \ \
generated by cgit v0.12 at 2025-01-23 13:05:14 (GMT)