summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Ensure the section header isn't shown twice.Martin Jones2010-07-141-1/+6
| | | | | | | Happened when currentItem was on a section boundary. Task-number: QTBUG-12089 (cherry picked from commit 181749ff7dcfbeb5eb64026e80353f27013af833)
* Export QDeclarativePixmapMartin Jones2010-07-141-1/+1
| | | | But its still a private class.
* Make Text, TextInput, and TextEdit all have the same size for the same text.Warwick Allison2010-07-134-21/+29
| | | | | | | | | | | | | This may mean that the cursor is to the right of the width, so components should cater for that with a margin if they are boxed / clipped. TextInput used to try to account for right bearing (and left bearing incorrectly since it added it on the right). This is removed. Potentially this means that for some fonts the text repaints incorrectly on the left or right, but if that is the case Text and TextEdit already had such a problem (undetected), and all will need fixing. Task-number: QTBUG-11983 (cherry picked from commit 628159323c60c434a202b036ecbaf5e433c703e8)
* Don't double delete cancelled pixmap cache requestsAaron Kennedy2010-07-131-3/+9
| | | | | QTBUG-11954 (cherry picked from commit cec6d01d17e39af6e8a139156a3b51fd45558a50)
* Fix inconsistent reporting of module import errors when using versions.Warwick Allison2010-07-131-3/+15
| | | | | Task-number: QTBUG-11936 (cherry picked from commit cabdb16f5ea6458dec9a2ec3b70a01e498b27dbc)
* Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
| | | | | | Task-number: QTBUG-12115 Reviewed-by: Martin Jones (cherry picked from commit 400b0d43830dfdcefb2f8bd91440ab6f4130ce0f)
* Update QtDeclarative def filesJoona Petrell2010-07-132-2/+17
| | | | (cherry picked from commit abd49d1d146b73a124b5e650f1b254da992ed3a4)
* Convert QtDeclarative def files to use LF line endingsJoona Petrell2010-07-132-3372/+3372
| | | | (cherry picked from commit 7e35c6ff442e237ff9a1bec9ea1cdfb597d9ceae)
* Update QtDeclarative def filesJoona Petrell2010-07-132-66/+131
| | | | (cherry picked from commit 23ef32dc0972d027617e5052192d1a17ba424f66)
* Added QDeclarativeSpringAnimationmae2010-07-138-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. (cherry picked from commit cb406a116bf2237c743ac05882fb06927c70359c)
* Add copy(), cut() and paste() support to TextInputJoona Petrell2010-07-133-0/+46
| | | | | | Task-number: QTBUG-12086 Reviewed-by: Michael Brasser (cherry picked from commit 0fdf5122c72eb86d49cba2b69f80d3a9c5949da6)
* Remove deprecated Flickable.flickDirectionMartin Jones2010-07-133-16/+1
| | | | (cherry picked from commit e3bc34b40559e0cb88363039ee61300478e7c700)
* Update QmlChanges.txtBea Lam2010-07-131-0/+4
| | | | (cherry picked from commit c3ee63fd9a1428718ca2f2a32e81a3f977878fad)
* Remove Image::pixmap property. QML applications should useBea Lam2010-07-133-14/+5
| | | | | | | QDeclarativeImageProvider to provide pixmaps instead. Task-number: QTBUG-11980 (cherry picked from commit 33b664eabe5d9621d71e5bf3bfcc46ea385a399c)
* Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-135-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 (cherry picked from commit a258456bcb35ec4211751a702ea94a1881d82a07)
* Make declarative pixmap cache easier to useAaron Kennedy2010-07-1311-675/+889
| | | | | | | | | | | | | | | | | | The QDeclarativePixmapCache was both slow, and very trickey to use correctly. Many QML elements did not correctly cancel outstanding requests, which leads to pixmaps leaking indefinately. Other elements, such as Text, were subject to race conditions that meant they may never actually load all their images. QDeclarativePixmap is a single class than encapsulates the action of fetching a pixmap, as well as the pixmap itself and the responsibility of canceling outstanding requests. Rather than relying on Qt's pixmap cache that doesn't cache all the information QML needs, QDeclarativePixmap implements its own cache, that correctly degrades over time (unlike QPixmapCache that can stop expiring items in some conditions). Reviewed-by: Warwick Allison (cherry picked from commit 09f07b98dfdaec2e48749768b967a48e588d3f7f)
* Allow the debugger to modify method bodiesAaron Kennedy2010-07-136-35/+108
| | | | | QTBUG-11933 (cherry picked from commit 76a1804b0fff9ffd092a551defe448d3e9d4346e)
* Doc: Removed links to Qt3 support in QHostAddressGeir Vattekar2010-07-131-5/+7
| | | | | Task-number: QTBUG-12004 (cherry picked from commit 10039e4b5bb80e5a9705126e7c62c588039acde6)
* Quiet qmake warnings during configure.Aaron McCarthy2010-07-132-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 (cherry picked from commit 054049046e89d6e18d800f4728d4927354b640c6)
* Don't crash if drag.target has no parentItemMartin Jones2010-07-131-2/+2
| | | | | Task-number: QTBUG-11986 (cherry picked from commit 44d78dca77b8a5f4f0d1bb67e84c21a4c57345b6)
* Fix TextEdit with no color property defined is drawn with wrong colorJoona Petrell2010-07-131-0/+9
| | | | | | Task-number: QTBUG-11932 Reviewed-by: Martin Jones (cherry picked from commit 5500ffeeaee3412272f0f4af844fbc1d4d78a3bb)
* Fix TextInput text getting improperly clippedJoona Petrell2010-07-132-19/+28
| | | | | | Task-number: QTBUG-11790 Reviewed-by: Martin Jones (cherry picked from commit 37792d20eeef870a0d695fc15bc943f20275be9a)
* Changing currentIndex shouldn't cancel a flick unnecessarily.Martin Jones2010-07-132-24/+45
| | | | | | | | If the new currentIndex is in view, then there is no need to cancel a flick that is in progress. Task-number: QTBUG-11405 (cherry picked from commit c09f58965e772064ca952892f2e7969082f03855)
* Fix input methods for TextInput elements with key handlersJoona Petrell2010-07-131-0/+1
| | | | | | Task-number: QTBUG-10297 Reviewed-by: Martin Jones (cherry picked from commit 98bfc8b8db811eb902290dbe87660ce799a44c27)
* Fix text drawing into alpha pixmap with opengl engineEskil Abrahamsen Blomfeldt2010-07-122-6/+0
| | | | | | | | | | | | | | The merge 03dc74984749adf5b11482bf871a47086217845c mistakenly merged the glyphMargin() (which had been removed in 4.7 because QGLTextureGlyphCache now inherits from the image glyph cache) with the glyphPadding() which had been introduced in separate commits in both branches (probably backported.) This broke text drawing into a pixmap with an alpha with the GL engine, because we'd assume a margin of 1, but the alphaMapForGlyph() function doesn't support margins. Task-number: QTBUG-11987 Reviewed-by: Gunnar (cherry picked from commit 4e915e3942c1523ffdda01e36c019f842062b794)
* 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
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-068-34/+121
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix autotest Adapt the TapAndHold recognizer to non-touch too add setNativeArguments() and nativeArguments() fix bogus return value from qprocess::execute() qdoc: Simplified code to enable fixing of QTBUG-6340. Doc: fixing img style
| * Adapt the TapAndHold recognizer to non-touch tooThomas Zander2010-07-061-23/+40
| | | | | | | | | | | | | | | | The QTapAndHoldGestureRecognizer now can trigger also on mouse and GraphicsSceneMouse events and all of them will cause the gesture start event to be sent after the touch interval timed out. Reviewed-by: Denis
| * add setNativeArguments() and nativeArguments()Oswald Buddenhagen2010-07-067-7/+71
| | | | | | | | | | | | | | | | | | | | this function enables starting subprocesses which need command lines which cannot be constructed via the portable list-based api. such cases would be programs which need quoting rules which diverge from the msvc runtime. Reviewed-by: joerg Task-number: QTBUG-7620 (and various others which boil down to that)
| * fix bogus return value from qprocess::execute()Oswald Buddenhagen2010-07-061-4/+10
| | | | | | | | | | Task-number: QTBUG-230, QTBUG-5866 Reviewed-by: joerg
* | Support QSslSocket::systemCaCertificates() on SymbianSimon Hausmann2010-07-063-1/+199
|/ | | | | | | | | Implemented access to the unified certificate store on Symbian with Shane and Peter's help. Task-number: QTBUG-11399 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-052-3/+29
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support time zone designator in QDateTime::fromString() based on ISO 8601-2004 standard.
| * Support time zone designator in QDateTime::fromString() based on ISO ↵Liang Qi2010-07-052-3/+29
| | | | | | | | | | | | | | | | | | 8601-2004 standard. Task-number: QTBUG-11623 Reviewed-by: Denis Dzyubenko Reviewed-by: David Boddie
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-053-5/+50
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Set the registration time while using the collection generator to register. Network: Optimize HTTP proxy lookup on Windows qdoc: Added explanation of autmatically generated signal hanlers. QSslSocket::systemCaCertificates(): fix for WinCE Doc: fixing search script and style qdoc: Fixed type linking for QML properties (most of them).
| * | Network: Optimize HTTP proxy lookup on WindowsMarkus Goetz2010-07-051-5/+32
| | | | | | | | | | | | | | | | | | | | | Only try auto config retrieval once. Patch by Kai Koehne. Task-number: QTBUG-10106
| * | QSslSocket::systemCaCertificates(): fix for WinCEPeter Hartmann2010-07-052-0/+18
| |/ | | | | | | | | | | | | | | on WinCE the function is called "CertOpenStore", and not "CertOpenSystemStoreW". Patch-by: Ismail Donmez Task-number: QTBUG-11905
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-051-13/+39
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Character spacing when drawing a QPicture to a high DPI device."
| * Revert "Character spacing when drawing a QPicture to a high DPI device."Trond Kjernåsen2010-07-051-13/+39
| | | | | | | | | | | | This reverts commit d0fb8557f3fc3e7c9305662d118228ceca9df72b. This change breaks justified text drawing in QPrintPreview, so it's reverted for now.
* | Warn when drawPixmapFragments is called with an invalid source rectAndy Shaw2010-07-051-0/+9
| | | | | | | | | | | | | | | | | | | | When drawPixmapFragments() is called with fragments that has invalid source rects in it, then usually it causes the pixmap drawn on screen to appear corrupted. However it has been reported that a crash can occur (not reproducable locally) so by adding a warning in debug mode only means that this can hopefully be caught at development time. Reviewed-by: Trond
* | Fix build failure with cs2009q3 toolchain.Aaron McCarthy2010-07-052-7/+7
|/ | | | Use Qt typedef for unsigned 32-bit integers.
* make image handler includes privateOswald Buddenhagen2010-07-0418-32/+32
| | | | | now that they live in gui/image/ instead of plugins/imageformats/, the handlers need to get the usual _p suffix.
* fix symbian buildOswald Buddenhagen2010-07-031-2/+2
| | | | | as absolutely braindead as it is, symbian is a unix as far as qmake is concerned.