summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-03126-602/+1680
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-02105-573/+1492
| |\
| | * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-0271-455/+1107
| | |\
| | | * Merge commit 'oslo-staging-2/4.6' into upstream/4.6Olivier Goffart2009-12-0255-434/+927
| | | |\
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-023-4/+10
| | | | |\ | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | * qreal-izationAleksandar Sasha Babic2009-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defining QT_USE_MATH_H_FLOATS will enable single precision math functions that are called via Qt wrappers (qSin, qCos ...). Reviewed-by: axis
| | | | | * Clarify the docs a bit when setting focus.axis2009-12-011-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | | | * Minor doc update for known-issues wiki link.Janne Anttila2009-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6211 Reviewed-by: TrustMe
| | | | * | Reduce double-copying of textures when flipping upside downRhys Weatherley2009-12-021-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bindTexture() flipped images in-place, to reduce data copying. But there is one case where the in-place is worse: when the QImage is not detached. In that case, the flip was copying the entire image and then flipping the lines, effectively processing the contents twice. The new version uses mirrored() to reduce the overhead for non-detached images. Reviewed-by: Samuel
| | | | * | Fix crash in QVector::reserve when reserving smaller size on a shared vectorOlivier Goffart2009-12-012-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot call realloc with aalloc smaller than asize. Also include obvious optimisation: take the qMin computation out of the loop. Task-number: QTBUG-6416 Reviewed-by: Thiago
| | | | * | QWindowStyle: make sure there is no duplicate in the list of scrollbar.Olivier Goffart2009-12-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the list grow and waste memory and CPU each time the stylesheet is changed or the widget is shown Reviewed-by: Thierry Task-number: QTBUG-6409
| | | | * | Fixed a potential crash in QDockWidgetThierry Bastian2009-12-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened when inserting the gap over a place holder item. Task-number: QTBUG-6107 Reviewed-by: Gabi
| | | | * | QVariant documentation: there is no function QVariant::isEmpty()Olivier Goffart2009-12-011-1/+0
| | | | | |
| | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-0116-289/+546
| | | | |\ \
| | | | | * | Extended tst_QListView::indexAt to test viewport bounds.Gabriel de Dietrich2009-12-011-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
| | | | | * | Fix QFontCombobox autotest on X11Olivier Goffart2009-12-012-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On X11, Font might have a foundry within bracket. This foundry is set by the font combobox, and makes the font comparison fail. Make sure the other attributes (size, bold, ...) are preserved when the font is changed. Reviewed-by: Gabriel
| | | | | * | In QListViews, items were being hovered even when mouse was on the scrollbarsGabriel de Dietrich2009-12-011-2/+6
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Task-number: QTBUG-6284
| | | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-0112-281/+525
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | | * Merge branch 'mmfphonon' into 4.6Gareth Stockwell2009-11-3012-281/+525
| | | | | | |\
| | | | | | | * Clip video rect to physical screen dimensionsGareth Stockwell2009-11-261-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CVideoPlayerUtility API requires both a native window handle and an absolute screen rectangle in order to define the location of the rendered video output. On certain devices, such as the Nokia E75, which runs S60 3.2, if the absolute rectangle extends outside the physical screen extent, no video is rendered. This change works around this defect in the platform by clipping the video rectangle to the physical screen extent. Task-number: QTBUG-5467 Reviewed-by: trustme
| | | | | | | * Tidied up logic of retrieving video window in Phonon MMF backendGareth Stockwell2009-11-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5467 Reviewed-by: trustme
| | | | | | | * Suspend DSA while drawing is in progressGareth Stockwell2009-11-264-1/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to prevent flicker or - on some versions of the platform - video disappearing from the screen altogether, the video controller's DSA session must be suspended while the window control is redrawn. Task-number: QTBUG-5467 Reviewed-by: Jason Barron
| | | | | | | * Symbian control invokes slots before and after native draw opsGareth Stockwell2009-11-263-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct Screen Access (DSA) allows a client to request notification from the window server when drawing is performed by other threads, into a specified region of the screen. This allows DSA rendering - for example video - to be suspended when notifications are drawn, preventing the video content from overwriting the notification. If the drawing originates from the same thread as that which holds the DSA session, DSA must be suspended while drawing takes place. This change allows a widget to request notification when native drawing is about to be performed by QSymbianControl::Draw. Task-number: QTBUG-5467 Reviewed-by: Jason Barron
| | | | | | | * Changed video widget native paint mode to zero-fill native windowGareth Stockwell2009-11-262-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain S60 video stacks require the screen region in which video will be rendered to be painted with a zero brush (opaque black for EColor16MU displays; transparent black for EColor16MA / EColor16MAP). Task-number: QTBUG-5467 Reviewed-by: Jason Barron
| | | | | | | * Allow Symbian widget implementations to select native paint modeGareth Stockwell2009-11-263-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Symbian platform, the Qt raster paint engine targets an off-screen buffer owned by the Font & Bitmap server (FBSERV). When an area of the screen needs to be refreshed, the window server (WSERV) asks the control environment (CONE) to redraw the control(s) intersecting that screen region. Each Qt native widget has an associated Symbian control, whose Draw function blits the required region of the backing store via WSERV. Use cases involving Direct Screen Access (DSA) may require this behaviour to be modified, to either of the following: - Disable: the Draw function does nothing. In this case, the output of paint events, rendered to the backing store, is not blitted to the screen. This mode was introduced by change 8f445e13. - Zero fill: the Draw function fills all pixels within the redraw region with zeroes. This change allows the widget implementation to select either of these alternative modes by setting a flag in its QWExtra structure. Note that these alternative modes are only suitable for native widgets, because they act on a per-control rather than per-widget basis. Task-number: QTBUG-5467 Reviewed-by: Jason Barron
| | | | | | | * Adjust qmediaplayer's settings dialog for small screens.Frans Englich2009-11-251-160/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch done jointly by me and Jan-arve. Task-number: QTBUG-4725 Reviewed-by: Jan-Arve Sæther Reviewed-by: Frans Englich
| | | | | | | * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-2387-461/+771
| | | | | | | |\
| | | | | | | * \ Merge branch '4.6' into mmfphononFrans Englich2009-11-20575-6352/+18797
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/qmediaplayer/mediaplayer.cpp
| | | | | | | * | | Added additional keyboard shortcuts to MediaPlayerGareth Stockwell2009-11-191-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These shortcuts are used for pausing video playback while in full-screen mode, and for exiting full-screen mode. They are for non-QWERTY mobile devices, which lack keys mapping to the previously existing shortcut keycodes. Reviewed-by: Frans Englich
| | | | | | | * | | Added 'fullscreen video' menu option to media playerGareth Stockwell2009-11-192-90/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5586 Reviewed-by: Frans Englich
| | | | | | | * | | Mediaplayer: do not exit full-screen when pausedGareth Stockwell2009-11-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This modifies the patch which introduced "exit full screen when end of playback is reached": f9d36789 Reviewed-by: Frans Englich
| | | | | | | * | | Keep the same capitalization for Phonon.dll.Frans Englich2009-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4735
| | | | | | | * | | qmediaplayer: pausing behavior for dialog inconvenient.Frans Englich2009-11-162-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmediaplayer when popping up dialogs shouldn't: * play when it's paused * pause when playing only audio Task-number: QTBUG-5851 Reviewed-by: Gareth Stockwell
| | | | * | | | | | Added caching of vectorpaths to the GL paint engine.Gunnar Sletta2009-12-015-11/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first time a path is drawn we call makeCachable on the path, which means that if it is drawn again, we start caching it. This is a bit of a trick to avoid caching paths that are drawn once and discared while at the same time cache paths that are reused automatically. The GL engine owns the vertex information and is responsible for cleaning it up. If the vectorpath is destroyed first, it will call the cleanup function. if the engine dies first, we still require some hooks to clean up the cache in the path. More to come. When VBO's are used, these will be a leaked if the path is destroyed after the engine. Reviewed-by: Samuel
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-01822-8669/+24396
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Fix crash in qt3support QPixmap constructorGunnar Sletta2009-12-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| | | | | * | | | | Fix tst_qsharedmemory on UnixOlivier Goffart2009-11-301-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | executable does not end with .exe on Unix, while it is valid to call the executable without the .exe on windows Reviewed-by: Joao
| | | | | * | | | | Doc: Fixed up a known issue.David Boddie2009-11-301-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | * | | | | Only call updateFont if the font have changed.Alexis Menard2009-11-302-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When receiving the polish event, we call updateFont only if the font has changed (from the QApplication::font()). This avoid to clear sizeHints cache. Task-number:QTBUG-6272 Reviewed-by:janarve
| | | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-304-4/+5
| | | | | |\ \ \ \ \
| | | | | | * | | | | Fixed square root of negative number in drawTextItem().Kim Motoyoshi Kalland2009-11-302-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed potential bug where you could end up taking the square root of a negative number in drawTextItem() in the raster and OpenGL paint engines. Task-number: QTBUG-6327 Reviewed-by: Trond
| | | | | | * | | | | Fixed the GL2 engine stroker to handle Qt::SvgMiterJoin.Kim Motoyoshi Kalland2009-11-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| | | | | | * | | | | Do not fill the disabled background of item.Olivier Goffart2009-11-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression against Qt 4.5 If one want special background for disabled item, one can use stylesheet, or BackgroundRole This partially revert 127e68d3dc4ff8329 Reviewed-by: jbache Task-number: QT-2388 Task-number: QTBUG-6319
| | | | | * | | | | | Add some notes about known issues for win32-iccJan-Arve Sæther2009-11-302-1/+11
| | | | | |/ / / / /
| | | | | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-11-306-5/+18
| | | | | |\ \ \ \ \
| | | | | | * | | | | Do not recoginze templated types or pointers as flags.Olivier Goffart2009-11-303-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those types can never by flags. This fixes QML as they do not use Q_DECLARE_METATYPE in a way visible to moc. Patch by Aaron Kennedy Reviewed-by: Kent Hansen
| | | | | | * | | | | Compile webkit for win32-iccJan-Arve Sæther2009-11-302-2/+2
| | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for the first hunk is that the Intel compiler does not support the __has_trivial_constructor type trait. The Intel Compiler can report itself as _MSC_VER >= 1400. The reason for that is that the Intel Compiler depends on the Microsoft Platform SDK, and in order to try to be "fully" MS compatible it will "pretend" to be the same MS compiler as was shipped with the MS PSDK. (Thus, compiling with win32-icc with VC8 SDK will make the source code "think" the compiler at hand supports this type trait). The second hunk is simply for including stdint.h since MS does not ship that in their PSDK. Reviewed-by: Simon Hausmann
| | | | | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-301-1/+1
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | | | * | | | Fix tst_qspinbox compilation with winscw.Liang Qi2009-11-271-1/+1
| | | | | | | | | | |
| | | | | * | | | | | X11: Avoid loading all fonts in system for text with line breaksEskil Abrahamsen Blomfeldt2009-11-301-1/+1
| | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The line separator code point has no glyph in any font, something we would detect by running through a complete font merging loop and trying all fonts in the system on X11. This would cause the memory consumption to sky rocket the first time you added text with line breaks to an application, and it was an unnecessary performance hit. Now we special case the line separator and do no attempt to search for it in the fonts. Task-number: QTBUG-4537 Reviewed-by: Simon Hausmann