summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in docs.Jason McDonald2010-04-091-1/+1
| | | | | Task-number: QT-1632 Reviewed-by: Trust Me
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-063-1/+27
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda )
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-04-063-1/+27
| | | | | | | | | | | | | | | | ( e3dc4ef2b801d91e115c54f833fa7766d392ceda ) Changes in WebKit/qt since the last update: * r51006 -- https://bugs.webkit.org/show_bug.cgi?id=31475 -- Crash in StringHash::equal due to unaligned string data
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash for multiscript text in QTextEngine::boundingBox()
| * | Fix crash for multiscript text in QTextEngine::boundingBox()Eskil Abrahamsen Blomfeldt2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logClusters pointer is already adjusted for the item, so it should be indexed relative to the item, hence from 0 to itemLength-1. Adding pos to the index would give us a random value for all script items > 0. Thus this would sometimes crash for text that spanned several scripts, since we would sometimes get a value back which was outside the bounds of the glyph array. Task-number: QTBUG-9374 Reviewed-by: Samuel
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-063-12/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed modal dialog not to have automatic "Exit" right softkey in S60.
| * | | Fixed modal dialog not to have automatic "Exit" right softkey in S60.Janne Anttila2010-04-063-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During softkey refactoring this piece of code get changes, but the changed code did not work correctly if window had no softkey actions. Switched back to old way where softkey source is stored to variable, and windowType is asked from stored variable. If softkey source is dialog or popup, "Exit" is not added automatically to RSK. Task-number: QT-2203 Reviewed-by: Sami Merila
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-064-38/+24
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove qWait functions as it is used in QTRY_* macros. QAudioInput: possible change of state without emitting stateChange() Did not include updated repaint number for parent item in revert. Partially revert "Remove qWait functions as it is used in QTRY_* macros." Remove qWait functions as it is used in QTRY_* macros.
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Toby Tomkins2010-04-062-2/+1
| |\ \ \ | | | | | | | | | | | | | | | into 4.6-multimedia
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-061-1/+1
| | |\ \ \
| | * | | | QAudioInput: possible change of state without emitting stateChange()Kurt Korbatits2010-04-062-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed state change from close() function, should be set by caller depending on context. Task-number:QTBUG-9357 Reviewed-by:Dmytro Poplavskiy
| * | | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-061-23/+13
| | |/ / / | |/| | | | | | | | | | | | | Reviewed-by: rohan mcgovern
| * | | | Did not include updated repaint number for parent item in revert.Toby Tomkins2010-04-061-1/+1
| |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-051-14/+11
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Partially revert "Remove qWait functions as it is used in QTRY_* macros." Remove qWait functions as it is used in QTRY_* macros.
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-031-14/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Partially revert "Remove qWait functions as it is used in QTRY_* macros." Remove qWait functions as it is used in QTRY_* macros.
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-011-14/+11
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Partially revert "Remove qWait functions as it is used in QTRY_* macros." Remove qWait functions as it is used in QTRY_* macros.
| | | * | | Partially revert "Remove qWait functions as it is used in QTRY_* macros."Toby Tomkins2010-04-011-172/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needs investigation of autotest failures on QWS, osx, win platforms. This reverts commit 741b75b8e595a26944ba8fca8835463787b02676. Conflicts: tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | | * | | Merge commit 'origin/4.6' into 4.6-multimediaToby Tomkins2010-04-01100-821/+1581
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Toby Tomkins2010-04-019-3/+365
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 4.6-multimedia
| | | * | | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-011-327/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: rohan mcgovern
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-052-0/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Implementing QFontEngineS60::getSfntTableData()
| * | | | | | | Implementing QFontEngineS60::getSfntTableData()Alessandro Portale2010-04-052-0/+32
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That function was not yet implementing. Its absense caused some Harfbuzz based shaping not to happen. See Robert DeWolf's comment on task QTBUG-5857 Since QFontEngineS60 is private implementation and generally not exported, no symbols need to be added to the .def files for this patch. Task-number: QTBUG-5857 Reviewed-by: trustme
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-032-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix doc for deprecated QGridLayout::colSpacing: point to existing method qDebug() << myPointF would remove spaces in following arguments.
| * | | | | Fix doc for deprecated QGridLayout::colSpacing: point to existing methodDavid Faure2010-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 544 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | | | qDebug() << myPointF would remove spaces in following arguments.David Faure2010-04-031-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Merge-request: 544 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-011-2/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix crash in the fileiconprovider for Windows
| * | | | Fix crash in the fileiconprovider for WindowsJens Bache-Wiig2010-04-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases the fileiconprovider has been reported to crash while accessing icons with overlays. This situation got worse with change b67bd25be08b54c3e6e49b2b9429e54ff58db268 since these cases were often hidden by broken caching. The workaround for now is to simply check that the hIcon structure is non empty before converting the icon. Task-number: QTBUG-8324 Reviewed-by: ogoffart
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-313-6/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ensure Phonon MMF backend emits aboutToFinish Remove compiler warning
| * | | | Ensure Phonon MMF backend emits aboutToFinishGareth Stockwell2010-03-312-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that, after a call to CMdaAudioPlayerUtility::SetPosition, the reported position values are slightly lower than they should be. This, combined with the fact that the backend emitted aboutToFinish from its timer tick slot, means that the aboutToFinish signal is sometimes not emitted at the end of an audio clip, if the position has been advanced by seeking during playback. This patch adds a check in the implementation of the MMdaAudioPlayerCallback::MapcPlayComplete callback - if, at this point, aboutToFinish has not been emitted, it is emitted now. Task-number: QTBUG-9368 Reviewed-by: trustme
| * | | | Remove compiler warningGareth Stockwell2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT complains that a non-POD type (VideoParameters) is passed through the TRACE_ENTRY ellipsis, when building in debug mode. Reviewed-by: trustme
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-314-3/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compile error with QT_NO_NETWORKDISKCACHE in QtNetwork Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.
| * | | | Fix compile error with QT_NO_NETWORKDISKCACHE in QtNetworkTasuku Suzuki2010-03-312-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2332 Reviewed-by: Peter Hartmann
| * | | | Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.David Faure2010-03-312-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 541 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-311-6/+13
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Allow attributes to be bound after a QGLShaderProgram is linked.
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Rhys Weatherley2010-03-3110-294/+8
| |\ \ \ \
| * | | | | Allow attributes to be bound after a QGLShaderProgram is linked.Rhys Weatherley2010-03-311-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9450 Reviewed-by: Sarah Smith
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-311-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix translation mistake spotted by Laurent Montel
| * | | | | Fix translation mistake spotted by Laurent MontelDavid Faure2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 542 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-3115-306/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Add a children private property needed for QML to support QGraphicsObject" Revert "struct -> class, it's better." Revert "Add NOTIFY to size property so QML bindings are working fine." Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry changes" Revert "Add a a layout property in QGraphicsWidget." Add a workaround for a bug in Mac filesystem watcher. Another "off by 1" problem in OpenVG - in paths this time. Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs. Compile on MingW struct -> class, it's better. Add a a layout property in QGraphicsWidget. Fix QFileSystemModel to not install useless watchers on the filesystem
| * | | | | | Revert "Add a children private property needed for QML to support ↵Alexis Menard2010-03-317-273/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsObject" This reverts commit 4be83fa7337c5a4eb7b0ce085aa5854af5d33252. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp This drops the support of QML on top of 4.6
| * | | | | | Revert "struct -> class, it's better."Alexis Menard2010-03-311-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1d094129c0c3994df4e59cd9eda6981a7b131903.
| * | | | | | Revert "Add NOTIFY to size property so QML bindings are working fine."Alexis Menard2010-03-313-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 79a02c86c445e50630bcae62a4505f212281ec8b. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp This drop the support of QML on top of 4.6
| * | | | | | Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry ↵Alexis Menard2010-03-313-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes" This reverts commit 13bccd4ade76dd8a9c1cc067cc2b8da69c11def2. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp Drop the support of QML on top of 4.6
| * | | | | | Revert "Add a a layout property in QGraphicsWidget."Alexis Menard2010-03-313-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 87fae30fc63460e0ed2cc98f55a22e28d7520311. This drop the support of QML on top of 4.6
| * | | | | | Add a workaround for a bug in Mac filesystem watcher.Alexis Menard2010-03-301-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| * | | | | Another "off by 1" problem in OpenVG - in paths this time.Rhys Weatherley2010-03-301-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary so far: paths and images do not need the 0.5 adjustment to the transform, but glyphs do. Not sure why glyphs do, but the fonts definitely look wrong without the adjustment. Task-number: QT-3192 Reviewed-by: trustme
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-3010-3/+40
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs. Compile on MingW struct -> class, it's better. Add a a layout property in QGraphicsWidget. Fix QFileSystemModel to not install useless watchers on the filesystem
| | * | | | Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.David Boddie2010-03-303-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-307-2/+21
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile on MingW struct -> class, it's better. Add a a layout property in QGraphicsWidget. Fix QFileSystemModel to not install useless watchers on the filesystem
| | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2010-03-3041-172/+590
| | | |\ \ \ \
generated by cgit v0.12 at 2025-01-08 16:50:53 (GMT)