summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-0819-31/+107
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use lower case for including system header files Added trace statements to Phonon MMF backend MMF Phonon backend: call winId() from VideoWidget constructor Fixed crash which occurs when switching between video clips Close media clip before creating new player object Enable bufferStatus signal during video clip loading on NGA platforms Prevent crash when video is played without a VideoWidget Add partial update deployment rules to QtNetwork Fix crash when handleCommand() called before softkeys are updated
| | * | Use lower case for including system header filesGareth Stockwell2010-07-076-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All platform includes are now lower case, i.e. '#include <foobar.h>' rather than '#include <FooBar.h>'. Note that Qt includes are still camel case, e.g. '#include <QtGui/QWidget>' Task-number: QTBUG-6528 Reviewed-by: trustme
| | * | Added trace statements to Phonon MMF backendGareth Stockwell2010-07-071-0/+17
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | MMF Phonon backend: call winId() from VideoWidget constructorGareth Stockwell2010-07-072-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to be consistent with the backends for other platforms, which also call QWidget::winId() on the VideoWidget (or one of its children) during construction. Reviewed-by: Thierry Bastian
| | * | Fixed crash which occurs when switching between video clipsGareth Stockwell2010-07-072-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Phonon::MediaObject::setCurrentSource() is called when the MediaObject is connected to a Phonon::VideoWidget, the MMF::AbstractVideoOutput pointer is propagated inside the backend from the first MMF::AbstractVideoPlayer to the second. If the VideoWidget is subsquently re-sized, the code path enters the ScaleFactors branch of the MMF::SurfaceVideoPlayer::handleParametersChanged function. At this point, m_displayWindow is still set to the inital null value, and the assertion therefore fails. This change ensures that m_displayWindow is updated before attempting to apply the scale factor change. Task-number: QTBUG-11377 Reviewed-by: Thierry Bastian
| | * | Close media clip before creating new player objectGareth Stockwell2010-07-075-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failure to Close() an existing MMF player utility object before creating a new one - which happens in the MMF backend's implementation of Phonon::MediaObject::setCurrentSource() - causes intialization of the newly-created utility to fail later on. Task-number: QTBUG-11377 Reviewed-by: Thierry Bastian
| | * | Enable bufferStatus signal during video clip loading on NGA platformsGareth Stockwell2010-07-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CVideoPlayerUtility::RegisterForVideoLoadingNotification() was only called in the DSA, not the NGA, variant of the Phonon MMF backend. Task-number: QTBUG-11378 Reviewed-by: Thierry Bastian
| | * | Prevent crash when video is played without a VideoWidgetGareth Stockwell2010-07-073-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonon API allows video to be played via a Phonon::MediaObject, even if no Phonon::VideoWidget has been connected to it. This patch prevents the Phonon MMF backend crashing in this scenario due to dereferencing a null pointer. Reviewed-by: Thierry Bastian
| | * | Add partial update deployment rules to QtNetworkShane Kearns2010-07-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial update allows you to build a qtnetwork.sis which can be installed on top of a matching qt.sis, but contains only the qtnetwork.dll file. This is faster to install, so it's useful when developing qtnetwork. Reviewed-by: Simon Hausmann
| | * | Fix crash when handleCommand() called before softkeys are updatedJason Barron2010-07-072-1/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys are updated via a compressable event that is posted via the event loop. Since these events are not delivered immediately, there is a chance that a call to handleCommand() could happen before the softkeys have been updated which can lead to a crash if the previous QAction's have been deleted already since the data structure used by QSoftKeyManager is outdated. The likeliness of this is increased by the fact that S60 commands are normally sent from the WSERV active object which has a higher priority than the active object used by Qt's event loop which means commands will preempt the event loop. The fix is to introduce a flag that keeps track of pending update requests and if a command is received while there are outstanding requests, force the softkeys to be updated before handling the command. Task-number: QT-3571 Reviewed-by: axis
* | | 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
| | |
| * | Fix Symbian buildJoona Petrell2010-07-081-0/+2
| | |
* | | Allow the debugger to modify method bodiesAaron Kennedy2010-07-087-39/+160
|/ / | | | | | | 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-0710-17/+622
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |
* | Add Symbian support for runtime.orientation propertyJoona Petrell2010-07-076-9/+205
| | | | | | | | | | Task-number: Reviewed-by: Martin Jones
* | 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-0794-4393/+5062
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-0728-3488/+3799
| |\
| | * 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-0690-4366/+5033
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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. ...
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0690-4366/+5033
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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. ...
| | | | * Prevent a recursive debug output loop when writing to the logger widget.Robert Griebl2010-07-061-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (On Maemo5 the input method may generate a qWarning when someone clicks into the logger widget, which leads to an endless output recursion) Reviewed-by: Harald Fernengel
generated by cgit v0.12 at 2025-08-19 11:45:52 (GMT)