summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-048-39/+45
| | | | | | Previously it would not use the autogenerated def files. RevBy: Thomas Zander
* Fixed def file usage for the makefile build system on the SDK plugin.axis2010-06-041-6/+11
| | | | RevBy: Thomas Zander
* Fixed S60_VERSION variable exists checksMiikka Heikkinen2010-06-031-8/+14
| | | | | | | | Apparently else:exists(xxx)|exists(yyy) syntax doesn't work as I originally expected if both xxx and yyy exist, so change the check to use nested exists. Reviewed-by: Jason Barron
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-035-30/+46
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Avoid mmap() on symbian os Fix Qt.sis content for Symbian^3 builds
| * Avoid mmap() on symbian osShane Kearns2010-06-022-2/+2
| | | | | | | | | | | | | | | | | | QResource and QTranslator use mmap() on unix as an optimisation. Symbian OS doesn't support memory mapped files, so mmap() is actually worse than opening and reading the file yourself. So, switched off mmap() usage on symbian. Reviewed-by: mread
| * Fix Qt.sis content for Symbian^3 buildsMiikka Heikkinen2010-06-023-28/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | Some build-time omissions from Qt_template.pkg are done, so qt.sis built on Symbian^3 will not work properly on most S60 3.x & 5.0 devices. This should not be an issue, as Symbian^3 builds are expected to be configured to use OpenVG anyway. If necessary, it is still possible to build Qt.sis compatible with older platforms also on Symbian^3 if you fake the S60 version when calling qmake, e.g.: 'qmake S60_VERSION=5.0' Reviewed-by: Shane Kearns
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0364-939/+1175
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add Q_AUTOTEST_EXPORT Ensure PathView mappedRange is updated when pathItemCount changes. Doc Fix basic types docs indentation Improve basic types documentation. Don't imply that Item has Remove Media elements from Elements index Add some Q_AUTOTEST_EXPORTs Keep ListView highlight in sync when currentItem changes geometry. QDeclarativeImage::updatePaintedGeometry() does not need to be a slot QML viewer now supports TopUp, TopDown, RightUp and LeftUp orientations Text should update when the alignment changes. Add qml import plugins to qt.iby and qt.sis Take into account platform differences in input panel support More autoScroll fixes Doc fixes and improvements - fix some example code, link to Add Vector3dAnimation to list of QML elements
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-031-0/+1
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-039-250/+259
| | |\ \
| | * | | Ensure PathView mappedRange is updated when pathItemCount changes.Martin Jones2010-06-031-0/+1
| | | | |
| * | | | Add Q_AUTOTEST_EXPORTAaron Kennedy2010-06-031-1/+1
| | |/ / | |/| |
| * | | DocAaron Kennedy2010-06-031-1/+1
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-033-240/+253
| |\ \ \
| | * | | Fix basic types docs indentationBea Lam2010-06-031-242/+242
| | | | |
| | * | | Improve basic types documentation. Don't imply that Item hasBea Lam2010-06-031-30/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties like "geometry" and "position". Task-number: QTBUG-11169
| | * | | Remove Media elements from Elements indexBea Lam2010-06-031-8/+3
| | |/ /
| | * | Keep ListView highlight in sync when currentItem changes geometry.Martin Jones2010-06-031-1/+5
| | | | | | | | | | | | | | | | Task-number: QTBUG-11110
| * | | Add some Q_AUTOTEST_EXPORTsAaron Kennedy2010-06-037-10/+10
| |/ /
| * | QDeclarativeImage::updatePaintedGeometry() does not need to be a slotMartin Jones2010-06-031-2/+0
| | |
| * | QML viewer now supports TopUp, TopDown, RightUp and LeftUp orientationsBea Lam2010-06-027-56/+79
| | | | | | | | | | | | | | | | | | | | | | | | instead of Portrait/Landscape. The new orientations are named the same as the orientations in the QtMobility sensors module. Task-number: QTBUG-11106 Reviewed-by: akennedy
| * | Text should update when the alignment changes.Michael Brasser2010-06-021-0/+2
| | |
| * | Add qml import plugins to qt.iby and qt.sisJoona Petrell2010-06-022-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10835, QTBUG-9784 Reviewed-by: Alessandro Portale Import plugins provide functionality (webkit, gesture, folderlistmodel, particle elements) that is important for QML application development and should be included in Qt 4.7 deployment. Even the plugins labeled as "Qt Labs" plugins will be maintained in the future Qt 4.x releases.
| * | Take into account platform differences in input panel supportJoona Petrell2010-06-029-141/+285
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Warwick Allison
| * | More autoScroll fixesWarwick Allison2010-06-022-2/+18
| | | | | | | | | | | | Task-number: QTBUG-11143
| * | Doc fixes and improvements - fix some example code, link toBea Lam2010-06-0235-486/+488
| | | | | | | | | | | | examples from class docs and improve assorted docs
| * | Add Vector3dAnimation to list of QML elementsBea Lam2010-06-021-0/+1
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-014-10/+94
|\ \ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Introduced getter and setter for the visual X cursor position. Defines whether the cursor should keep its current position.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-014-10/+94
| |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Introduced getter and setter for the visual X cursor position. Defines whether the cursor should keep its current position.
| | * | Introduced getter and setter for the visual X cursor position.Roberto Raggi2010-06-012-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mechanism allows the cursor to move up and down on a visually straight line with proportional fonts, and to gently "jump" over short lines. Reviewed-by: mae
| | * | Defines whether the cursor should keep its current position.Roberto Raggi2010-06-014-10/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defines whether the cursor should keep its position when text gets inserted at the current position of the cursor. For example, we don't want QTextCursor to extend the selection when inserting characters at the end of an extra selection representing a user-type but we do want the selection to grow when rewriting a region of code (e.g. when using our QuickFix engine). Task-number: QTBUG-11075 Reviewed-by: mae
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-017-51/+65
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't remove the pixmap from cache when not modifying it. Speed up QStaticText with affine transformation on GL2 engine
| * | | 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-0149-290/+716
| |\ \ \ | |/ / / |/| | |
* | | | 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
generated by cgit v0.12 at 2024-11-23 22:25:42 (GMT)