summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Adding some error checking for setdefaultif"axis2010-07-131-3/+1
| | | | | | This reverts commit 0b56799601690a747c42dfbbefe95f18e837eb3f. Should not be necessary anymore after 61daa2f41969688.
* Fixed a possible hanging bug in the Symbian networking.axis2010-07-131-1/+2
| | | | | | | | | | | | | | | | | | | | I haven't seen the bug happening in practice, but I decided to be safe rather than sorry. The rationale is that if a network request comes in, the select thread will signal the active object in the main thread, remove the socket from the set of monitored sockets, and then go to sleep in the waitCond.wait() call, waiting for reactivation by the QSelectMutexGrabber. However, in QEventDispatcherSymbian::socketFired(), if the event causes the socket to be deleted, reactivateSocketNotifier will never be called, and therefore the wait condition will never be terminated. Fixed by only entering the wait condition if a grabber has already written to the pipe, signalling that it wants the lock. AutoTest: Passed RevBy: Markus Goetz
* Fixed a network hanging bug on Symbian.axis2010-07-131-9/+8
| | | | | | | | | | | | | | | | | | | | | | The problem happened because of a race condition in the way Qt cancelled the select call from Open C. Under high network loads, a network request could come in, causing the select call to end. Afterwards, the pipe normally used to cancel the select call would be emptied (although it was already empty). If a context switch happened after the pipe was emptied, but before the lock was released in waitCond.wait(), the main thread could try to grab the lock and write to the pipe because it was unsuccessful. This would in turn cause the next call to select to terminate immediately, and without work to do, the select thread would go straight down to waitCond.wait() and get stuck there. Fixed by moving the pipe draining loop from the select thread to the main thread, right after the lock grab. This guarantees that the select thread is empty when returning to the select call. Task: QT-3358 AutoTest: Passed RevBy: Markus Goetz
* Added some asserts to avoid race conditions in networking.axis2010-07-121-0/+6
| | | | | Task: QT-3358 RevBy: Markus Goetz
* 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
* | Add copy(), cut() and paste() support to TextInputJoona Petrell2010-07-123-0/+46
| | | | | | | | | | Task-number: QTBUG-12086 Reviewed-by: Michael Brasser
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1068-4859/+5258
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-1068-4859/+5258
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | * 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-0944-1078/+206
| | |\
| | | * Make test pass and fix docs following removal of SpringFollowBea Lam2010-07-092-3/+3
| | | |
| | | * doc improvementsBea Lam2010-07-092-5/+27
| | | |
| | | * Fix crashmae2010-07-082-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Got introduced with change f62f6effab8d1551d8e5e5843dc478addee96de1 Reviewed-by: Roberto Raggi
| | | * Follow -> Behaviormae2010-07-088-1006/+2
| | | | | | | | | | | | | | | | 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-0863-4255/+5575
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | (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-083-14/+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-085-46/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-12/+15
| | |\ \
| | | * | Micro optimization in QML date/time formatting functions.Michael Brasser2010-07-081-12/+15
| | | | |
| | * | | Allow the debugger to modify method bodiesAaron Kennedy2010-07-086-35/+108
| | |/ / | | | | | | | | | | | | QTBUG-11933
| | * | QML: Let the debugger now the name of embedded functions within a QML functionOlivier Goffart2010-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if you have stuff like Rectangle { function foo() {... } } We let QtScript, and hence the debugger know the function name. Reviewed-by: Roberto Raggi
| | * | Added QDeclarativeSpringAnimationmae2010-07-078-2/+604
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QDeclarativeSpringAnimation is a replacement for QDeclarativeSpringFollow. The idea is to remove the Follows quickly. Follows used to have an inSync property. In order to provide an alternative mechanism, the commit also fixes the running property for animations which are controlled by a behavior. Previously running would always return false and never change. Now running does change and indicates that the animation is running indeed.
| | * | docsBea Lam2010-07-075-17/+23
| | | |
| | * | Don't crash if drag.target has no parentItemMartin Jones2010-07-071-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-11986
| | * | QDeclarativeText optimization.Michael Brasser2010-07-072-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | updateSize() shouldn't trigger another updateSize(). Reviewed-by: Martin Jones
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0743-4139/+4530
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (35 commits) 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 Revert "Fix exponential behavior of QTextCursor::removeSelectedText" Prevent a recursive debug output loop when writing to the logger widget. Fix performance of QTextDocumentPrivate::adjustDocumentChangesAndCursors Convert QtDeclarative def files to use LF line endings Update QtDeclarative def files doc improvements Changing currentIndex shouldn't cancel a flick unnecessarily. Fix input methods for TextInput elements with key handlers Document the QML enumeration basic type Fix TextEdit with no color property defined is drawn with wrong color Export QDeclarativePixmap doc Fix inconsistent reporting of module import errors when using versions. Make declarative pixmap cache easier to use Prepare for QTest persistent store for visual tests. Loosen font-sensitive test. Set correct license header. ...
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-0721-3407/+3722
| | | |\ \
| | | | * | Remove deprecated Flickable.flickDirectionMartin Jones2010-07-073-16/+1
| | | | | |
| | | | * | Revert "Fix exponential behavior of QTextCursor::removeSelectedText"Michael Brasser2010-07-072-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 62db6c18c7f1f60819783ed5e1340e9fc09e072e, which introduced a regression in tst_qtextpiecetable::checkDocumentChanged
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0639-4115/+4521
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (31 commits) Prevent a recursive debug output loop when writing to the logger widget. Fix performance of QTextDocumentPrivate::adjustDocumentChangesAndCursors Convert QtDeclarative def files to use LF line endings Update QtDeclarative def files doc improvements Changing currentIndex shouldn't cancel a flick unnecessarily. Fix input methods for TextInput elements with key handlers Document the QML enumeration basic type Fix TextEdit with no color property defined is drawn with wrong color Export QDeclarativePixmap doc Fix inconsistent reporting of module import errors when using versions. Make declarative pixmap cache easier to use Prepare for QTest persistent store for visual tests. Loosen font-sensitive test. Set correct license header. Work around QTBUG-11929 <br/> shouldn't trigger a new format range in QDeclarativeStyledText. Add styled text layout benchmark. Optimize QDeclarativeStyledText. ...
generated by cgit v0.12 at 2024-10-26 20:38:03 (GMT)