summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* New class: QGlyphsEskil Abrahamsen Blomfeldt2010-06-0417-16/+1069
| | | | | | | | | | | | | Introduce an API to access glyph indexes in a font directly. A bug was discovered during this work, where different hinting flags in loadGlyph() and loadGlyphMetrics() would make the metrics in the two functions different, thus causing drawCachedGlyphs() (which uses loadGlyphMetrics() indirectly) to use different metrics than the standard drawTextItem() code path (which uses loadGlyph()). The bug was visible in the tst_QGlyphs::drawExistingGlyphs() test. Reviewed-by: Simon Hausmann
* QItemSelectionModel: When rows are removed from the middle of the range, ↵Stephen Kelly2010-06-032-5/+61
| | | | | | | remove them from the selection. Merge-request: 2403 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-0310-131/+1845
|\ | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix LeftToRight + setSpacing + setWrapping when drag-and-dropping Remove tst_QStringRef::localeAwareCompare Itemviews: use localeAwareCompare for comparing in the widget classes tst_qstringref.cpp: Fix licence header and compilation on windows Add some convenience functions for QStringRef
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-0310-131/+1845
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix LeftToRight + setSpacing + setWrapping when drag-and-dropping Remove tst_QStringRef::localeAwareCompare Itemviews: use localeAwareCompare for comparing in the widget classes tst_qstringref.cpp: Fix licence header and compilation on windows Add some convenience functions for QStringRef
| | * Fix LeftToRight + setSpacing + setWrapping when drag-and-droppingIan Walters2010-06-023-9/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quite a number of assumptions in qlistview assume either wrapping or spacing, but not both. This fixes the Flow left to right case. The TopToBottom case is not affected. TopToBottom + wrapping still works TopToBottom + spacing still works, TopToBottom + spacing + wrapping is still as broken as ever. Drag move prior to this patch was correct, but also need the drop to use the spacing when determining what index to apply to, not just the drag move. Reviewed-by: gabi Merge-Request: 586 Task-number: QTBUG-8938
| | * Remove tst_QStringRef::localeAwareCompareOlivier Goffart2010-06-021-176/+0
| | | | | | | | | | | | This new test breaks on embedded.
| | * Itemviews: use localeAwareCompare for comparing in the widget classesOlivier Goffart2010-06-021-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-10839 Reviewed-by: Thierry
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-016-121/+1930
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: tst_qstringref.cpp: Fix licence header and compilation on windows Add some convenience functions for QStringRef
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-016-121/+1930
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: tst_qstringref.cpp: Fix licence header and compilation on windows Add some convenience functions for QStringRef
| | | | * tst_qstringref.cpp: Fix licence header and compilation on windowsOlivier Goffart2010-06-011-4/+3
| | | | | | | | | | | | | | | | | | | | Somehow the emacs macro for style did a too good job
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-316-121/+1931
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add some convenience functions for QStringRef
| | | | | * Add some convenience functions for QStringRefAnders Bakken2010-05-316-121/+1931
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStringRef was hard to use for a lot of real-world tasks since it lacked methods similar to the ones in QString for indexOf/lastIndexOf/contains/startsWith/endsWith This patch adds that functionality. I also copied the relevant test cases from QString for the new APIs and introduced a QStringRef test. Merge-request: 625 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-by: ossi
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0313-125/+446
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Backport open pages switcher from Qt Creator. Remove in-page switcher. Add missing trace, small cleanup.
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0213-125/+446
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Backport open pages switcher from Qt Creator. Remove in-page switcher. Add missing trace, small cleanup.
| * | | | | Backport open pages switcher from Qt Creator.kh12010-06-028-30/+403
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| * | | | | Remove in-page switcher.kh12010-06-025-75/+9
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| * | | | | Add missing trace, small cleanup.kh12010-06-023-20/+34
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
* | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-06-02589-5892/+290189
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (241 commits) 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(). Missed file. Documentation. Optimization for sci file loading. Ensure text color set by S60 input method works for QML Items License. Avoid refilling view during model change. Test positionAt. Fix positionAt when autoScroll is use. 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 ...
| * | | | | Merge remote branch 'origin/master' into qt-master-from-4.7Olivier Goffart2010-06-021-1/+0
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/spectrum/app/engine.h demos/spectrum/app/mainwidget.h demos/spectrum/app/settingsdialog.h demos/spectrum/app/spectrograph.h demos/spectrum/app/spectrumanalyser.h demos/spectrum/app/tonegenerator.h demos/spectrum/app/tonegeneratordialog.h demos/spectrum/app/utils.h demos/spectrum/app/waveform.h
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-019-1/+22
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Examples: Fix compilation with namespaces.
| * | | | Examples: Fix compilation with namespaces.ck2010-06-019-1/+22
| | | | |
| | * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-01589-5873/+290192
| | |\ \ \ | |/ / / / |/| | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-017-78/+148
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Fixed a typoGeir Vattekar2010-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10951
| | | * | | 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>
| | | * | | Make sure we don't pull inn /usr/X11 stuff in the qws mkspek confJørgen Lind2010-06-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | | * | | 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>
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0134-204/+529
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Missed file. Documentation. Optimization for sci file loading. Ensure text color set by S60 input method works for QML Items License. Avoid refilling view during model change. Test positionAt. Fix positionAt when autoScroll is use. 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. Repaint all text when Ctrl+A is pressed in TextEdit
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-012-3/+19
| | | |\ \ \ \
| | | | * | | | Documentation.Michael Brasser2010-06-011-1/+16
| | | | | | | |
| | | | * | | | Optimization for sci file loading.Michael Brasser2010-06-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| | | * | | | | Missed file.Warwick Allison2010-06-011-0/+8
| | | |/ / / /
| | | * | | | 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
| | | * | | | License.Warwick Allison2010-06-011-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass headers test
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-0161-321/+599
| | | |\ \ \ \
| | | | * | | | Test positionAt.Warwick Allison2010-06-011-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11127 Task-number: QTBUG-11054
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-0160-320/+555
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0128-188/+323
| | | | | |\ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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.
| | | | | * | | | Fix example code and imageBea Lam2010-06-011-0/+0
| | | | | | | | |
| | | | | * | | | Fix docYann Bodson2010-06-011-1/+1
| | | | | | | | |
| | | | | * | | | 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-3125-183/+317
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 some bugs in the QML Web Browser buttonsAlan Alpert2010-05-312-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now with fewer warnings! Also, the stop button works.
| | | | | * | | | | | Fix zoom bug in QML Web Browser demoAlan Alpert2010-05-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zooming out no longer zooms to smaller than the window size.
| | | | | * | | | | | Fix TypoAlan Alpert2010-05-311-1/+1
| | | | | | |/ / / / | | | | | |/| | | |
| | | | | * | | | | Various doc fixes and improvementsBea Lam2010-05-3112-42/+159
| | | | | | | | | |
| | | | | * | | | | Document issues with rectangle border width of 1 where clipping is usedBea Lam2010-05-313-2/+33
| | | | | | | | | |
generated by cgit v0.12 at 2024-12-11 19:53:57 (GMT)