summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add missing #endif.Thiago Macieira2009-10-061-0/+1
| | | | Pointed out by David Faure
* Fix the valueForProgress to pass.Jan-Arve Sæther2009-10-051-65/+74
| | | | | | | The reference data had some errors due to bugs in QString::setNum(). We now serialize the number ourselves, and at the same time always generate all 4 digits, just to emphasize the precision we want. It now also passes if sizeof(qreal) == sizeof(float).
* Remove trailing whitespaceJan-Arve Sæther2009-10-051-5/+5
|
* Merge branch '4.6'Thiago Macieira2009-10-051323-25419/+15830
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.h tools/assistant/translations/translations_adp.pro tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf tools/qdoc3/test/qt.qdocconf translations/assistant_adp_de.ts
| * Fix uninitialized read in QFormLayoutPrivate::setupVerticalLayoutData()Andreas Kling2009-10-051-1/+1
| | | | | | | | | | Merge-request: 1541 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Adapt to libtiff 4.0 changesBernhard Rosenkraenzer2009-10-051-0/+5
| | | | | | | | | | | | | | | | | | | | In libtiff 4.0, TIFF_VERSION has been replaced with TIFF_VERSION_CLASSIC (to indicate normal tiff support) and TIFF_VERSION_BIG (to indicate BigTIFF support) Merge-request: 1547 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * QPropertyAnimation now uses QMetaObject::metacall instead of qt_metacallThierry Bastian2009-10-051-2/+2
| | | | | | | | | | | | | | This allows the animations to work with the newly integrated dynamic metaobject Reviewed-by: Michael Brasser
| * Simplification and use of QGraphicsObject in sub-attas demoThierry Bastian2009-10-0522-674/+181
| | | | | | | | Reviewed-by: alexis
| * Added operator== for QDBusArgument.Andre Moreira Magalhaes (andrunko)2009-10-051-0/+3
| | | | | | | | | | Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com> Merge-Request: 1657
| * Autotest: disable the forwardDeclared1 test in WinSCW too.Thiago Macieira2009-10-051-1/+1
| | | | | | | | | | | | | | | | | | It also invokes the destructor directly, even on forward-declared types. That must be an ABI convention. This test isn't reliable. Reviewed-by: TrustMe
| * Autotest: Don't run 15 and 35 threads on Windows CE.Thiago Macieira2009-10-051-1/+2
| | | | | | | | | | | | | | The device can't cope, so let's keep only the small thread count tests there. Reviewed-by: Trust Me
| * Changed Qt package name in pkg and generated sis files for Symbian.Janne Anttila2009-10-052-10/+10
| | | | | | | | | | | | | | | | | | It was decided on weekly telco that Symbian pkg and sis files can use plain Qt name, since it is already clear that user is installing "Qt for Symbian" version of Qt. Task-number: QT-772 Reviewed-by: Miikka Heikkinen
| * Added autotest for qFastSin() and qFastCos().Kim Motoyoshi Kalland2009-10-053-0/+74
| | | | | | | | Reviewed-by: Trond
| * fix creation of qws directory when app start preceeds qvfbJeremy Katz2009-10-052-1/+2
| | | | | | | | | | | | | | | | Change authored by Rhys. Bug introduced by the change to allow user-specific cache and pipe directories. Reviewed-by: Jeremy
| * Doc fix.Alexis Menard2009-10-051-0/+30
| | | | | | | | Reviewed-by:TrustMe
| * Tooltip: reusing tooltips sometimes goes wrongRichard Moe Gustavsen2009-10-051-1/+1
| | | | | | | | | | | | | | | | | | We reuse tooltip whenever we can. But we forget to check if the format of the text changes inbetween (from html to plain). This causes the word wrap to fail sometimes. This change will fix that. Rev-By:MortenS
| * Make QEventTransition works with QGraphicsObject.Alexis Menard2009-10-053-8/+11
| | | | | | | | | | | | | | | | | | | | | | QStateMachine framework installs QObject event filters to catch events in order to triggers the proper transition. But installing a QObject event filter on a QGraphicsObject gives nothing because QGraphicsView events filters works differently. In order to make this works we now post events using QApplication::postEvent in addition to the QGraphicsView events. Reviewed-by:andreas
| * Disable etched text on rich text labelsJens Bache-Wiig2009-10-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | When rendering etched text on disabled rich text labels we would previously draw distorted links. This is basically because anything that did not render with the text foreground role would be drawn twice as a shadow. Since there is no way to properly render this text etched we will rather disable it completely when the label uses rich text. Task-number: QTBUG-4543 Reviewed-by: Simon Hausmann
| * Fixed tst_qgraphicsitem.cpp compilation for Nokia X86 compiler.Janne Anttila2009-10-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Nokia X86 compiler is not able to resolve correct templated qCompare functionfor derived types. So implicit casting does nto work corectly. I have tried to add template specilations for qCompare also, but then compiler complainf about unambiguous functions. The promlem for now is fixed by adding explicit cast to same type against which the comparuion is done. Reviewed-by: TrustMe
| * Compile on Visual Studio 2003Eskil Abrahamsen Blomfeldt2009-10-051-1/+1
| | | | | | | | | | | | Don't add export declaration for the definition of the variable. Reviewed-by: Gunnar
| * Fixed sharedmemory autotest build for RVCT.Janne Anttila2009-10-051-1/+1
| | | | | | | | | | | | | | Without this fix we got the following error: "line 776: Error: #254: type name is not allowed" Reviewed-by: TrustMe
| * Make it possible to implement engine-specific drop shadow filtersRhys Weatherley2009-10-053-30/+27
| | | | | | | | | | | | | | | | | | | | | | | | It wasn't possible for the paint engine to override the drop shadow filter because QPixmapDropShadowFilter::draw() was not asking for an engine-specific filter object. Also, change the OpenVG filter to use vgGaussianBlur() instead of vgConvolve(), and draw the original image on top of the shadow. Task-number: QTBUG-4583 Reviewed-by: trustme
| * Consistently use QGLShareContextScope for context switchingRhys Weatherley2009-10-054-63/+45
| | | | | | | | | | | | | | | | QGLShareContextScope is safer and more reliable than trying to manually detect how and when to temporarily switch contexts. Replace the few remaining instances of context-switching with it. Reviewed-by: trustme
| * Merge QGLContextReference into QGLContextGroupRhys Weatherley2009-10-042-73/+62
| | | | | | | | Reviewed-by: trustme
| * Move QGLContextResource management into QGLContextGroupRhys Weatherley2009-10-042-94/+37
| | | | | | | | | | | | | | | | | | Context resources are per-group, so they should be managed by the group. This should also improve performance of context shutdown slightly by removing QGLSignalProxy::aboutToDestroyContext() signal dispatches to the resources. Reviewed-by: trustme
| * Add unit tests for QGLContextResourceRhys Weatherley2009-10-042-2/+50
| | | | | | | | Reviewed-by: trustme
| * Adding comments.Alessandro Portale2009-10-031-0/+9
| |
| * Doc: Document HTML and status as properties.Volker Hilsheimer2009-10-031-5/+7
| |
| * Doc: silence qdoc warnings in S60 specific documentation.Volker Hilsheimer2009-10-032-3/+4
| | | | | | | | Not sure why the migration classes should be are \obsolete.
| * Doc: silence more qdoc warnings.Volker Hilsheimer2009-10-035-17/+10
| | | | | | | | | | Mark QGraphicsAnchor::unsetSpacing as reset function of the spacing property.
| * Doc: add \since 4.6 to new QGraphicsItem::PanelModality enum.Volker Hilsheimer2009-10-031-0/+1
| |
| * Silence moc warning.Volker Hilsheimer2009-10-031-0/+1
| |
| * Compile Rogue example again after state machchine event type rename.Volker Hilsheimer2009-10-031-1/+1
| |
| * Enable multitouch on the Gradients demoBenjamin Poulain2009-10-021-1/+3
| | | | | | | | | | Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| * Enable multitouch on the affine demoBenjamin Poulain2009-10-021-1/+3
| | | | | | | | | | Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| * Add multitouch to the PathStroke demoBenjamin Poulain2009-10-023-5/+97
| | | | | | | | | | | | | | | | Add multitouch to the position of the path, and enable multitouch on the controls of the demo. Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| * Add multitouch capabilities to the shared classes of the demoBenjamin Poulain2009-10-023-1/+104
| | | | | | | | | | | | | | | | | | | | Add multitouch feature to the HoverPoints and the ArthurWidget. Multitouch is enabled by default for widgets using HoverPoints. The ArthurWidget propagate the TouchEvents in order to have them handled by a parent if a parent accept the touch events. Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| * Stablilize autotests on X11Olivier Goffart2009-10-022-7/+14
| |
| * Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-0290-378/+1086
| |\ | | | | | | | | | | | | Conflicts: demos/mediaplayer/mediaplayer.pro
| | * Changed implementation of qDrawBorderPixmap() to use qDrawPixmaps().Kim Motoyoshi Kalland2009-10-026-240/+262
| | | | | | | | | | | | Reviewed-by: Trond
| | * Added support for drawing a pixmap multiple times in one call.Kim Motoyoshi Kalland2009-10-029-48/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is internal API. It's possible to specify a horizontal and vertical scale, rotation, opacity and source rectangle for each pixmap item. Useful for particle effects. Reviewed-by: Trond
| | * Added qFastSin() and qFastCos() functions.Kim Motoyoshi Kalland2009-10-023-2/+333
| | | | | | | | | | | | | | | | | | The new functions use a lookup table. Reviewed-by: Trond
| | * Add prefix to statemachine-specific event typesKent Hansen2009-10-025-9/+9
| | | | | | | | | | | | | | | | | | "Signal" and "Wrapped" is too generic; prefix with StateMachine. Reviewed-by: Eskil Abrahamsen Blomfeldt
| | * Doc: mark API of Gesture framework as preliminary.Volker Hilsheimer2009-10-024-1/+10
| | | | | | | | | | | | New API will most likely not be in the Beta release.
| | * Adds a bool to QAbstractAnimationPrivate to keep track of top-level animationsLeonardo Sobral Cunha2009-10-022-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | Also refactored the timer verifications on (un)registerAnimation: we should never register an animation that has a registeredTimer, but we can unregister an animation several times. Reviewed-by: thierry
| | * Mac: bugfix 45f095b8970dc3c1b6f6e97fa2323654ba848288Richard Moe Gustavsen2009-10-021-9/+16
| | | | | | | | | | | | | | | | | | Seems like I forgot to handle page scrolls. Also did a small optimization (see also 45f095b8970dc3c1b6f6e97fa2323654ba848288)
| | * Demos and applications have a nice Qt logo when installed on SymbianEspen Riskedal2009-10-0264-65/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a line to the symbianpkgrules.pri files which includes an ICON if the TARGET.UID3 is defined. We should fix the application_icon.prf to handle ICON without UID3 situations more gracefully, but for now I reordered existing UID3s to be specified before the symbianpkgrules.pri includes. Reviewed-by: Aleksandar Babic
| | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-0224-76/+147
| | |\
| | * | Enable overriding TARGETTYPE and OPTION statements with MMP_RULESMiikka Heikkinen2009-10-022-19/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If MMP_RULES contains TARGETTYPE or any OPTION statements, default values for these will not be added to MMP file. This allows for example conditional OPTIONs and using native PLUGIN target type using MMP_RULES. Task-number: QT-2229 Reviewed-by: axis
| * | | Merge branch '4.6' into mmfphononFrans Englich2009-10-0290-1454/+3387
| |\ \ \ | | | |/ | | |/|