summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-096-6/+159
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-0911-20/+174
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Regressions in Global Object prototype access Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 ) Autotest: fix paths on the test server after update. Fix typo in docs.
| | * Regressions in Global Object prototype accessKent Hansen2010-04-093-4/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.5, changing the prototype of the (custom) global object used to "Just Work"(tm). In the JSC-based back-end, the built-in global object acts as a proxy if a custom global object is set, because JSC doesn't (yet, anyway) provide a way to replace the global object. To complicate this further, we also have a proxy to the original global object (that bypasses the custom global object proxying (!)). This is so that properties of the original global object can still be accessed with the QtScript C++ API when a custom global object has been set. Unfortunately, JSObject::prototype()/setPrototype() are not virtual, meaning that a change of prototype in the source object is not reflected in the proxy or vice versa. Work around this for now by syncing the prototype at the appropriate places (QScriptEngine::setGlobalObject(), QScriptValue::setPrototype()). This fixes all except the case when a prototype is set from JS, since such a write doesn't go through our public C++ API. But this case can be detected and handled by the global object's JSObject::put() reimplementation. Created a separate report for that issue: QTBUG-9737. Task-number: QTBUG-7066 Reviewed-by: Jedrzej Nowacki
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-04-093-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 ) 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' into qt-4.7-from-4.6Thiago Macieira2010-04-095-14/+15
|\ \ \ | | |/ | |/|
| * | Autotest: fix paths on the test server after update.Thiago Macieira2010-04-094-13/+14
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-091-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix typo in docs.
| | * Fix typo in docs.Jason McDonald2010-04-091-1/+1
| | | | | | | | | | | | | | | Task-number: QT-1632 Reviewed-by: Trust Me
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-0932-147/+239
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/multimedia/audio/qaudioinput_win32_p.h
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-095-24/+76
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Corruption in data captured by QAudioInput Just one (static) waveInCriticalSection but multiple QAudioInput to Mismatch between reported and actual supported sample rates in
| | * | Corruption in data captured by QAudioInputKurt Korbatits2010-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increased default buffer size and period size for windows. 11025monoS16LE was choppy, needed bigger periods. Task-number:QTBUG-9101 Reviewed-by:Derick Hawcroft
| | * | Just one (static) waveInCriticalSection but multiple QAudioInput toKurt Korbatits2010-04-094-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | record from different soundcards Task-number:QTBUG-9221 Reviewed-by:Andrew den Exter
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-0711-89/+71
| | |\ \ | | |/ / | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-073-52/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-073-52/+25
| | | | | | | | | | | | | | | | | | | | Reviewed-by: jason mcdonald
| * | | | 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 )
| | * | | 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
| | * | | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-061-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: rohan mcgovern
| | | | | | * Mismatch between reported and actual supported sample rates inKurt Korbatits2010-04-071-11/+63
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtMultimedia backend for Windows -Added 8000 as long as another frequency is available. -options available changed from hard-coded to detected options. Task-number:QTBUG-9100 Reviewed-by:Derick Hawcroft
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-061-1/+1
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Did not include updated repaint number for parent item in revert.Toby Tomkins2010-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
| | * | | 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.
generated by cgit v0.12 at 2025-01-13 10:59:52 (GMT)