summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make declarative pixmap cache easier to useAaron Kennedy2010-07-1312-733/+930
| | | | | | | | | | | | | | | | | | 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-137-39/+160
| | | | | QTBUG-11933 (cherry picked from commit 76a1804b0fff9ffd092a551defe448d3e9d4346e)
* Fix qdoc error.Jason McDonald2010-07-131-2/+2
| | | | | | Task-number: QTBUG-12078 Reviewed-By: Trust Me (cherry picked from commit e45b8dceca9c424815c6b08355a95cb34382186c)
* 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-132-0/+27
| | | | | | Task-number: QTBUG-11932 Reviewed-by: Martin Jones (cherry picked from commit 5500ffeeaee3412272f0f4af844fbc1d4d78a3bb)
* qmlviewer: Update the proxy factory when the user changes the proxy.Martin Jones2010-07-131-42/+62
| | | | | Task-number: QTBUG-11856 (cherry picked from commit 953142469cd49fd2f5180a60dcaa7d2029457401)
* Fix TextInput text getting improperly clippedJoona Petrell2010-07-139-22/+110
| | | | | | Task-number: QTBUG-11790 Reviewed-by: Martin Jones (cherry picked from commit 37792d20eeef870a0d695fc15bc943f20275be9a)
* Calling setMinimumSize(0, 0) on a top-level window sometimes triggers a bugRobert Griebl2010-07-133-50/+40
| | | | | | | | | | | in the Compiz window manager which leads to the QML viewer mainwindow not being composited anymore (at least until the next resize). Since we need to somehow switch between fixed size and freely resizable views, we have to work around that bug using the layout constraint hints. Task-number: QTBUG-11771 Reviewed-by: kkoehne (cherry picked from commit 07321dfceed41c1851781841e03c4148da47e41e)
* 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-133-8/+23
| | | | | | 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)
* 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
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0716-463/+299
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0616-463/+299
| |\ |/ / | | | | | | | | | | | | | | | | | | | | 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
| * fix autotestOswald Buddenhagen2010-07-061-0/+5
| | | | | | | | | | fixing QProcess::execute() revealed that this test has always been broken on windows.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0615-463/+294
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: 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-069-8/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-062-4/+19
| | | | | | | | | | | | | | | Task-number: QTBUG-230, QTBUG-5866 Reviewed-by: joerg
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-068-24/+123
| | |\
| | | * Doc: fixing img styleMorten Engvoldsen2010-07-061-2/+9
| | | |
| | * | qdoc: Simplified code to enable fixing of QTBUG-6340.Martin Smith2010-07-064-426/+97
| | | | | | | | | | | | | | | | | | | | | | | | Also reworded some of the text for QTBUG-11575. Task-number: QTBUG-6340, QTBUG-11575
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-063-1/+199
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support QSslSocket::systemCaCertificates() on Symbian
| * | | 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-063-71/+15
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Spectrum demo: fixed installation Spectrum build: fixed DLL rpath
| * | Spectrum demo: fixed installationGareth Stockwell2010-07-062-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in order for them to be correctly installed. Task-number: QTBUG-11572 Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
| * | Spectrum build: fixed DLL rpathGareth Stockwell2010-07-062-60/+3
|/ / | | | | | | | | | | | | | | | | | | Rather than explicitly modifying LD_LIBRARY_PATH using a shell script when the application is launched, the relative path from the application binary to the FFT library is encoded in the application using an --rpath flag. Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-054-4/+41
|\ \ | | | | | | | | | | | | | | | | | | 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-054-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0511-36/+161
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | Set the registration time while using the collection generator to register.kh12010-07-051-0/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11911 Reviewed-by: ck
| * | | 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
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-055-15/+61
| |\ \
| | * | 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
| | * | Doc: fixing search script and styleMorten Engvoldsen2010-07-053-15/+43
| | | |
| * | | qdoc: Added explanation of autmatically generated signal hanlers.Martin Smith2010-07-051-12/+58
| |/ / | | | | | | | | | Task-number: QTBUG-11575
| * | qdoc: Fixed type linking for QML properties (most of them).Martin Smith2010-07-053-4/+8
| | | | | | | | | | | | Task-number: QTBUG-6340
* | | 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.
generated by cgit v0.12 at 2025-01-21 08:06:07 (GMT)