summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Merged in some of Thomas Zander's suggestions.David Boddie2010-07-161-2/+47
| | | | Reviewed-by: Trust Me
* Doc: Fixed name clash.David Boddie2010-07-161-1/+0
| | | | Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-12650-14435/+19598
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-123-19/+23
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix qdoc error. Quiet qmake warnings during configure.
| | * Merge remote branch 'oslo-staging-2/4.7' into qtbug-11996Aaron McCarthy2010-07-12143-1147/+5629
| | |\
| | | * Fix qdoc error.Jason McDonald2010-07-121-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12078 Reviewed-By: Trust Me
| | * | Quiet qmake warnings during configure.Aaron McCarthy2010-07-082-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure runs qmake on all .pro files in the source tree. Wrapping symbian only code in symbian scopes prevents warnings about unset EPOCROOT on other platforms. Task-number: QTBUG-11996
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-127-281/+513
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Minor modifications and optimizations to the Symbian HW glyph cache. Convert to new EGL API. Don't invert glyphs for the default VG font cache on Symbian. Move QVGFontGlyphCache from source file into a separate header Ensure glyphs are upright instead of upside-down. Enable cross-process glyph cache for OpenVG graphics system on Symbian. Factor out RSgImage -> VGImage conversion to separate function. Add new file for Symbian specific VG stuff and add Symbian glyph cache. Move QVGFontGlyphCache from source file into a separate header Make cacheGlyphs() function (and the destructor) virtual.
| | * | | Minor modifications and optimizations to the Symbian HW glyph cache.Jason Barron2010-07-121-49/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the latest round of API reviews, the Symbian glyph cache has now been moved from GDI to FBS and this required some changes in Qt's implementation. Also incorporate an optimization where we first iterate over the glyph vector to eliminate glyphs that are already cached in Qt's glyph cache. This way we only open the glyph iterator on glyphs that we need. Reviewed-by: Alessandro Portale
| | * | | Convert to new EGL API.Jason Barron2010-07-122-47/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent changes in Qt's EGL layer required some changes in the code used to convert RSgImage to/from VGImage. Reviewed-by: Gunnar Sletta
| | * | | Don't invert glyphs for the default VG font cache on Symbian.Jason Barron2010-07-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the hardware glyph cache API is not represent and in use, then the glyphs will not be inverted. Reviewed-by: TrustMe
| | * | | Move QVGFontGlyphCache from source file into a separate headerJason Barron2010-07-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed in order to subclass and override in the Symbian specific implementation. Reviewed-by: Rhys Weatherley
| | * | | Ensure glyphs are upright instead of upside-down.Jason Barron2010-07-123-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OpenVG paint engine traditionally takes glyph images from the alphaMapForGlyph() function which returns the glyph image in the upright projection. When it constructs a VGImage from this image, it passes a positive data stride which will read the top scanline of the source image into the bottom scanline of the VGImage due to the VG coordinate system. It then uses the path transform where the 'sy' value of the matrix is set to -1 and this re-inverts everything when drawing. With the Symbian based glyph cache, the VGImage is constructed from a RSgImage which is a hardware resource and compensates for the coordinate system used by VG and GL at the time it is created. In the case of the hardware glyph cache, the glyph image is read into the RSgImage using a negative data stride so it does not need to be inverted when drawn. To allow for this, introduce a flag which indicates that the 'sy' entry of the matrix should be flipped such that the glyph is drawn normally. Also in this patch is a change to the glyph origin which now uses the bottom of the glyph metric bounding rect instead of the top due to orientation of the glyph inside the VGImage. Reviewed-by: Alessandro Portale
| | * | | Enable cross-process glyph cache for OpenVG graphics system on Symbian.Jason Barron2010-07-124-22/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a specialized OpenVG font cache for the Symbian platform. By using RGlyphDataIterator we can create a VGImage to store inside a VGFont without having to upload our own glyph image. This works by utilizing RSgImage which can be used to share handles to graphics memory across processes thus allowing glyph images to be shared by multiple processes and reducing graphics memory usage. Reviewed-by: Alessandro Portale
| | * | | Factor out RSgImage -> VGImage conversion to separate function.Jason Barron2010-07-121-73/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code will now be used by both the fromNativeType() function and the upcoming glyph cache implementation. We also change the #ifdef's location here slightly because even if we do not have support for RSgImage, we still want to be able to support the CFbsBitmap conversion functions for the OpenVG graphics system. Reviewed-by: Alessandro Portale
| | * | | Add new file for Symbian specific VG stuff and add Symbian glyph cache.Jason Barron2010-07-125-260/+363
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out the Symbian specific bits of QVGPixmapData into a separate file and introduce our subclassed implementation of the VG font cache. Also make our font cache a friend of the S60 font engine because the cache needs to access the CFont member to create the glyph image. Reviewed-by: Alessandro Portale
| | * | | Move QVGFontGlyphCache from source file into a separate headerJason Barron2010-07-124-20/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed in order to subclass and override in the Symbian specific implementation. Reviewed-by: Rhys Weatherley
| | * | | Make cacheGlyphs() function (and the destructor) virtual.Jason Barron2010-07-121-2/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | This class will be implemented differently on Symbian due to the presence of a class that allows cross process sharing of glyph images so make this function virtual. Reviewed-by: Rhys Weatherley
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-12168-5684/+6603
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (69 commits) Remove use of SpringFollow and SmoothedFollow in qmlvisual test Fix Mac CI Add copy(), cut() and paste() support to TextInput Fix .pro file after class/test rename. Fix QTextDocument::markContentsDirty() Replace 4.6 in all .qdocconf files Resetting bindings through debugger interface Fix crash with invalid role indexes Make test pass and fix docs following removal of SpringFollow Remove autotests of depracted element SmoothedFollow doc improvements Clean up at the end of each test. Improve test reliability. Fix crash Follow -> Behavior Added some documentation to spring animation Fix spring animation Update QtDeclarative def files Fix exponential behavior of QTextCursor::removeSelectedText Optimization: change signal/slot to function call ...
| | * | Remove use of SpringFollow and SmoothedFollow in qmlvisual testBea Lam2010-07-123-31/+42
| | | | | | | | | | | | | | | | (onvert to use SpringAnimation and SmoothedAnimation instead)
| | * | Fix Mac CIJoona Petrell2010-07-122-0/+24
| | | |
| | * | Add copy(), cut() and paste() support to TextInputJoona Petrell2010-07-125-1/+117
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12086 Reviewed-by: Michael Brasser
| | * | Fix .pro file after class/test rename.Michael Brasser2010-07-111-1/+1
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-10165-5651/+6419
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (65 commits) Fix QTextDocument::markContentsDirty() Replace 4.6 in all .qdocconf files Resetting bindings through debugger interface Fix crash with invalid role indexes Make test pass and fix docs following removal of SpringFollow Remove autotests of depracted element SmoothedFollow doc improvements Clean up at the end of each test. Improve test reliability. Fix crash Follow -> Behavior Added some documentation to spring animation Fix spring animation Update QtDeclarative def files Fix exponential behavior of QTextCursor::removeSelectedText Optimization: change signal/slot to function call Don't show warning for attempts to load pixmaps asynchronously Remove Image::pixmap property. QML applications should use Update QmlChanges.txt Don't double delete cancelled pixmap cache requests ...
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-10165-5651/+6419
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (65 commits) Fix QTextDocument::markContentsDirty() Replace 4.6 in all .qdocconf files Resetting bindings through debugger interface Fix crash with invalid role indexes Make test pass and fix docs following removal of SpringFollow Remove autotests of depracted element SmoothedFollow doc improvements Clean up at the end of each test. Improve test reliability. Fix crash Follow -> Behavior Added some documentation to spring animation Fix spring animation Update QtDeclarative def files Fix exponential behavior of QTextCursor::removeSelectedText Optimization: change signal/slot to function call Don't show warning for attempts to load pixmaps asynchronously Remove Image::pixmap property. QML applications should use Update QmlChanges.txt Don't double delete cancelled pixmap cache requests ...
| | | * | Fix QTextDocument::markContentsDirty()mae2010-07-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function markContentsDirty(from,length) is documented to inform the document that it needs to lay out again the part from from to from + length. Trouble was that the function was implemented using beginEditBlock()/endEditBlock(), which has the negative side effect that it does increase the document's revision number and emits all sorts of contentChanged() signals. This did not matter from the one case where Qt uses the method itself in QSyntaxHighlighter, because here a private flag inContentsChange avoided the issue. Without the change, we cannot implement semantic syntax highlighting in creator without expensive extra selections or triggering a full rehighlight via QSyntaxHighlighter. Done-with: Roberto Raggi Reviewed-by: Roberto Raggi
| | | * | Replace 4.6 in all .qdocconf filesKai Koehne2010-07-092-8/+8
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | Resetting bindings through debugger interfaceLasse Holmstedt2010-07-094-0/+44
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-0978-1482/+343
| | | |\ \
| | | | * | Make test pass and fix docs following removal of SpringFollowBea Lam2010-07-093-5/+5
| | | | | |
| | | | * | Remove autotests of depracted element SmoothedFollowJoona Petrell2010-07-098-251/+0
| | | | | |
| | | | * | doc improvementsBea Lam2010-07-093-10/+32
| | | | | |
| | | | * | Clean up at the end of each test.Michael Brasser2010-07-081-0/+12
| | | | | |
| | | | * | Improve test reliability.Michael Brasser2010-07-081-2/+6
| | | | | |
| | | | * | Fix crashmae2010-07-082-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Got introduced with change f62f6effab8d1551d8e5e5843dc478addee96de1 Reviewed-by: Roberto Raggi
| | | | * | Follow -> Behaviormae2010-07-0828-1116/+113
| | | | | | | | | | | | | | | | | | | | | | | | Replace the usages of Follows with Behaviors, update docs.
| | | | * | Added some documentation to spring animationmae2010-07-081-0/+9
| | | | | |
| | | | * | Fix spring animationmae2010-07-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not stop a spring animation if the to value got changed while notifying the target property change.
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-08129-4669/+6592
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (52 commits) Update QtDeclarative def files Fix exponential behavior of QTextCursor::removeSelectedText Optimization: change signal/slot to function call Don't show warning for attempts to load pixmaps asynchronously Remove Image::pixmap property. QML applications should use Update QmlChanges.txt Don't double delete cancelled pixmap cache requests Extend QDeclarativeImageProvider to support QPixmap loading and Allow the debugger to modify method bodies Micro optimization in QML date/time formatting functions. Fix Symbian build QML: Let the debugger now the name of embedded functions within a QML function Added QDeclarativeSpringAnimation docs Add Symbian support for runtime.orientation property Don't crash if drag.target has no parentItem QDeclarativeText optimization. Make Text, TextInput, and TextEdit all have the same size for the same text. More generated images in anticipation of QT-3574 Remove deprecated Flickable.flickDirection ...
| | | | | * | Update QtDeclarative def filesJoona Petrell2010-07-082-2/+17
| | | | | | |
| | | | | * | Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-082-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an improved version of 62db6c18c7f1f60819783ed5e1340e9fc09e072e
| | | | | * | Optimization: change signal/slot to function callmae2010-07-084-10/+7
| | | | | | |
| | | | | * | Don't show warning for attempts to load pixmaps asynchronouslyBea Lam2010-07-082-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (should be handled by image providers, elements shouldn't have to know about the capabilities)
| | | | | * | Remove Image::pixmap property. QML applications should useBea Lam2010-07-084-45/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeImageProvider to provide pixmaps instead. Task-number: QTBUG-11980
| | | | | * | Update QmlChanges.txtBea Lam2010-07-081-0/+4
| | | | | | |
| | | * | | | Fix crash with invalid role indexesAaron Kennedy2010-07-091-0/+2
| | | | |/ / | | | |/| |
| | | * | | Don't double delete cancelled pixmap cache requestsAaron Kennedy2010-07-081-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-11954
| | | * | | Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-0814-147/+473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronous loading of QImages. (QPixmaps can only be created in the main thread so they will always be loaded synchronously). This changes request() to requestImage() and adds requestPixmap() for pixmap support. Task-number: QTBUG-11989
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-082-12/+17
| | | |\ \ \
| | | | * | | Micro optimization in QML date/time formatting functions.Michael Brasser2010-07-081-12/+15
| | | | | | |
generated by cgit v0.12 at 2024-10-12 05:27:51 (GMT)