summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-095-6/+32
|\
| * Regressions in Global Object prototype accessKent Hansen2010-04-092-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-0925-57/+178
|\ \ | |/ | | | | | | Conflicts: src/multimedia/audio/qaudioinput_win32_p.h
| * 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-077-14/+33
| |\
| | * 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
| * | | | | 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
| * | | | 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-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
| * | | 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-313-2/+8
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 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-311-1/+2
| | | | | | | | | | | | | | | | | | | | 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 4.6Rhys Weatherley2010-03-319-261/+6
| |\ \ \ | | |/ /
| * | | 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.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-065-15/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set Fix painting artifacts on text Prevented unnecessary copy in QImage::setAlphaChannel(). Change the ifdef for resolving function ptrs to match declaration
| * | | | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the introduction of transform properties in QGraphicsItem, QGraphicsItem::transform() is no longer enough to get the correct transform of an item. No auto-test as it involves mouse dragging. Reviewed-by: Yoann Task-number: QTBUG-9295
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-06237-5238/+6081
| |\ \ \ \
| | * | | | Prevented unnecessary copy in QImage::setAlphaChannel().Samuel Rødal2010-04-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the formats don't match the detch is unnecessary as operator= will anyways destroy the detached QImageData and substitute it with the newly created QImageData from convertToFormat. Task-number: QTBUG-9640 Reviewed-by: Trond
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
| | | | * | | | Change the ifdef for resolving function ptrs to match declarationTom Cooksey2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | | | | | Fix painting artifacts on textEskil Abrahamsen Blomfeldt2010-04-062-10/+7
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The height of the row is not only decided by the maximum height of the set of glyphs currently being added to the glyph cache, but also the height of the glyphs previously added to the current line in the glyph cache. To minimize the space used, we now calculate the maximum height for glyphs per line, and use this as the vertical advancement when positioning the next line in the cache. The change also removes a redundant test ((c_x + c.w > c.h) is caught earlier on and will always be false at this point.) Task-number: QTBUG-9176 Reviewed-by: Trond
* | | | | | | Doc: Remove QDBusServer from the public documentation.Thiago Macieira2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5066
* | | | | | | [Cocoa] QDialogs with WindowStayOnStopHint parentCarlos Manuel Duclos Vergara2010-04-061-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is with beginModalSession which reorders the windows and sends our window back. This patch queries the window level before calling beginModalSession and sets it after beginModalSession. Task-number: QTBUG-9392 Reviewed-by: Richard Moe Gustavsen
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-061-0/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a coding style issue of the GTK style Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++
| * | | | | | Fix a coding style issue of the GTK styleBenjamin Poulain2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A tab was introduced in 16614121f8eff813efadc999a7db9ce47eae769e
| * | | | | | Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-061-0/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GTK Style A QHashableLatin1Literal was a bit too clever for sunstudio. Added and alternate constructor for sunstudio(ifdef) Should not affect other compilers. Other: Minor compile fixes, extra semicolon after macros etc. Merge-request: 547 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-06223-4119/+4364
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-066-1/+462
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Labs (experimental) Gesture support.
| * | | | | | Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-052-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This of course requires installing libdbus compiled for Windows CE too. Task-number: QTBUG-9582 Patch-by: Romain Pokrzywka (from KDAB)
| * | | | | | Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixedThiago Macieira2010-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was: " Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Reviewed-By: Rohan McGovern "
| * | | | | | Revert "Attempt at fixing Phonon build issue on Symbian."Thiago Macieira2010-04-041-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7992ea34f9f1ed67d4e44f43c3a8133ae5aa3ac4. Turns out that this had already been fixed before the update to 4.4.0, but never upstreamed. Revert to the fixed version. I'll upstream the bugfix.
| * | | | | | Attempt at fixing Phonon build issue on Symbian.Thiago Macieira2010-04-041-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why, why did someone think that template QObjects with partially exported symbols was a good idea? Reviewed-by: Trust Me
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-031-0/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: [plugins] Don't conclude that a .debug file is a plugin.
| | * | | | | | [plugins] Don't conclude that a .debug file is a plugin.Thiago Macieira2010-04-031-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Unix systems (that are not Mac), the Qt buildsystem splits the code from the debug symbols using objcopy. The resulting .debug file contains a valid ELF header, with a copy of the main library's section headers. But the contents of those sections are missing. When we try to dlopen(3) those libraries, libdl crashes. So we shouldn't try to open those files.
generated by cgit v0.12 at 2025-01-12 22:19:24 (GMT)