summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-2011-13/+122
|\ | | | | | | 4.6-staging2
| * QAbstractSlider: keypad navigation is slow.Frans Englich2009-11-192-4/+74
| | | | | | | | | | | | | | Add logic to make keypad navigation faster when auto repeating. Task-number: QTBUG-5988 Reviewed-by: Gareth Stockwell
| * Symbian: QKeyEvent:isAutoRepeat() doesn't workFrans Englich2009-11-191-1/+1
| | | | | | | | | | Task-number: QTBUG-6011 Reviewed-by: Gareth Stockwell
| * Fix crash when using splash screen, or QPixmap::copy()Shane Kearns2009-11-192-0/+7
| | | | | | | | | | | | | | Missing virtual function now implemented Task-number: QTBUG-5977 Reviewed-by: axis
| * Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
| | | | | | | | Reviewed-By: Trust Me
* | Do not recreate the VGImage if the size is unchangedRhys Weatherley2009-11-202-33/+10
| | | | | | | | | | | | | | | | | | When a pixmap's contents change in QVGPixmapData, only recreate the VGImage in the GPU if the size is different than before. This should help reduce GPU memory fragmentation. Task-number: QT-2504 Reviewed-by: Sarah Smith
* | Remove unmatched else in non-EGL mode for OpenVG pixmap dataRhys Weatherley2009-11-201-1/+0
| | | | | | | | Reviewed-by: Gunnar Sletta
* | Prevent a deep copy of QImage::bits() in the OpenVG pixmap implementationRhys Weatherley2009-11-201-2/+10
| | | | | | | | | | Task-number: QTBUG-5869 Reviewed-by: Sarah Smith
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Olivier Goffart2009-11-194-24/+51
|\ \
| * | Item views: make sure the model is connected/disconnected correctlyThierry Bastian2009-11-192-8/+30
| | | | | | | | | | | | Reviewed-by: ogoffart
| * | Item views: make sure the hovered item is updated when scrollingThierry Bastian2009-11-192-16/+21
| | | | | | | | | | | | Reviewed-by: leo
* | | Fixes regression in QListView: Selection would not expend to the full viewportOlivier Goffart2009-11-191-2/+6
|/ / | | | | | | | | | | | | | | | | Commit ecc202c introduced the regression while fixing another regression (QTBUG-5854) The selection would not expend to the whole viewport. Reviewed-by: Robert Griebl
* | On main window, the sizegrip visibility was not correctly updatedThierry Bastian2009-11-191-8/+21
| | | | | | | | | | Task-number: QTBUG-4334 Reviewed-by: ogoffart
* | Fixes: QCommandLinkButton crop large icons.Olivier Goffart2009-11-191-1/+2
| | | | | | | | | | Task-number: QTBUG-1976 Reviewed-by: Gabi
* | Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-1939-271/+382
|\ \
| * \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1962-266/+334
| |\ \
| * | | Fixed Multi-length strings not implemented for float functionsOlivier Goffart2009-11-191-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5963 Reviewed-by: Oswald Buddenhagen Reviewed-by: Eskil
| * | | Revert "Fix detection of linux-g++"Paul Olav Tvete2009-11-194-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 333bd2e761af8aaf6efd3d66eb028af046c4dfc2. The change broke compilation of QWS, since QtGui depends on glib, but doesn't link with it directly. This needs to be fixed properly, but not just before the release. Reviewed-by: Harald Fernengel
| * | | Softkeymanager to not update sofkeys when native s60 dialog is shownJason Barron2009-11-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Qt Bug: QTBUG-5788 Softkeys do not change to dialog specific ones when native S60 dialog is being opened on top of Qt application Initial-patch-by: Markus Nolvi Reviewed-by: axis
| * | | Complement Phonon for Symbian documentation.Frans Englich2009-11-181-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: Gareth Stockwell
| * | | Fix multiple regressions in QGtkStyle caused by freetype fixesJens Bache-Wiig2009-11-182-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.6 reports smaller sizes for all fonts which means a lot of the size adjustments QGtkStyle does were now off. I have adjusted most of them including some fixes to menu items themselves. Note that the changes were introduced with this change: 04d18b38c38c5ff623b30366ea08d56128b9b7d0 We now also adapt to GNOME 2.16 style submenu arrow sizes. Combo boxes, line edits, spin boxes and push buttons should finally have a uniform height. Task-number: QTBUG-5753 Reviewed-by: thorbjorn
| * | | Fix QGtkStyle crash when switching themes.Robert Griebl2009-11-182-31/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for a bug that we introduced with the QGtkStyle refactoring to properly support Maemo5. RevBy: jbache
| * | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-184-119/+107
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-17143-2303/+1989
| | |\ \ \
| | * | | | doc: Clarified function of setLayoutDirection()Martin Smith2009-11-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5432
| | * | | | Removing unnecessary chunking and stat'ing when reading QIODeviceJoão Abecasis2009-11-171-54/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chunk size increased to QIODEVICE_BUFFERSIZE (currently 16k) where chunking is still needed. Namely, on sequential devices and when QByteArray is unable to allocate a large enough buffer. This is necessary for backward compatibility Improved validation and prevention of overflow in maxSize argument. Updated autotest that relied on a null QByteArray when no data was available and no errors were found. The only guarantee we should be providing in this case is an empty result -- even though that behavior is preserved for the time being. Affected functions: * QIODevice::read(qint64 maxSize) Chunking will still happen for large maxSize (i.e., QByteArray resize fails), where it could be used as a synonym for QIODevice::readAll(). No stat'ing performed. Read from device continues for as long as it is successful. Stops if an error occurs or if we get less data than requested. * QIODevice::readAll() Chunking is performed for sequential devices where total size wouldn't be known beforehand. For sequential devices, reading continues as long as data is returned, even if less than requested. Non-sequential devices will be stat'ed once. If QIODevice::size returns 0, this is taken to mean unknown size and chunking is performed. Otherwise, a single read request is made for the specified size. On failure to resize QByteArray, nothing is returned. * QIODevice::readLine(qint64 maxSize) Chunking is performed for maxSize == 0, or if we can't allocate a large enough buffer. No stat'ing performed at this level. Read from device continues until EOL is found, as long as we get all requested data. Task-number: QT-2347 Reviewed-by: Thiago Macieira Reviewed-by: Miikka Heikkinen
| | * | | | Fix regression introduced in c08e708037d33271825ce6a6a1ac640e96b70c36João Abecasis2009-11-171-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing nothing to a file, not actually writing anything is not an error. Also, from a change introduced in the same commit, there is no point in checking for EOF when writing. Task-number: QTBUG-5847 Reviewed-by: Olivier Goffart
| | * | | | Fix QIODevice::getChar optimizationJoão Abecasis2009-11-171-46/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Text mode there would be a huge penalty on each '\r' found even if the internal buffer was not exhausted, because we would repeatedly remove the '\r' from the buffer and put it back it. Before following through to the unoptimized code, anyway. Instead, we now loop over the internal buffer until we find a suitable character. Reduced code duplication by having QIODevice::getChar directly call QIODevice::read and letting compilers do their job. Reviewed-by: Markus Goetz
| | * | | | Remove needless loop in QIODevice::seekJoão Abecasis2009-11-171-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Either the buffer has more data than is being skipped and it can be cleared or it doesn't and we must skip it. If the total size of QRingBuffer exceeds INT_MAX there'll be bigger problems (e.g., QRingBuffer::size() will overflow) that can only be handled there and there's no point trying to work around them here. Reviewed-by: Markus Goetz
| | * | | | There should only be one write buffer at a time in QFileJoão Abecasis2009-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be sure, we should explicitly use the size of that buffer and not the whole QRingBuffer when flushing the data. With this change, we make violations of the one-buffer-rule explicitly fail on flush(), but we avoid corrupting data and reading past the buffer's end. Reviewed-by: Markus Goetz
| * | | | | Fix the mentioning of the LGPL licensing of QtScript and QtWebKitSimon Hausmann2009-11-181-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed with the legal team: * Removed the confusing sentence about the LGPL version. * Replaced the use of "Lesser" with "Library" * Use the same notice for QtWebKit and QtScript Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1860-715/+748
| |\ \ \ \ \
| | * | | | | register pointer type for invokeRobert Griebl2009-11-181-0/+4
| | | | | | |
| | * | | | | Remove DWCAPS_DOUBLEBUFFER in window creationAnders Bakken2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This value seems to cause problems on various chipsets and we get a double buffered window regardless. Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit 3bc9a381ebfaf9144120936bb579b71fc7cf29ae)
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Justin McPherson2009-11-17328-4760/+7293
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-11-174-29/+66
| | |\ \ \ \ \ \
| | | * | | | | | No audio devices found for Ubuntu with QAudio classesKurt Korbatits2009-11-164-29/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed alsa implementation to present audio devices from alsa. Task-number:QTBUG-5723 Reviewed-by:Justin McPherson
| | * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-11-124-7/+25
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fix compilation of Phonon DS9 backend when Qt is built statically.Andrew den Exter2009-11-123-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt_plugin_instance() isn't defined in a static build. Assign a pointer the shared mutex to static member variable in the backend constructor, rather than returning it from a static member function. Task-number: QTBUG-5207 Reviewed-by: Justin McPherson
| | | * | | | | | Fix assert on windows when deleting phonon nodes from a running graph.Andrew den Exter2009-11-121-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If removing a filter from the direct show graph fails because it is running, stop the graph and try again. Task-number: QTBUG-5011 Reviewed-by: Justin McPherson
| | | * | | | | | Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-111-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | Phonon; Integrate changes to cmake files.Justin McPherson2009-11-114-20/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-111-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | id. This fix is similar to KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
| | | * | | | | | Gstreamer: Added DVD supportJustin McPherson2009-11-111-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intergrated KDE change 1040729 by nlecureuil This bug was already fixed in Qt phonon repo in exactly the same way, but KDE change is applyed to keep phonon sources in sync. Reviewed-by: Dmytro Poplavskiy
| | | * | | | | | Gstreamer: Do not assume that the list index is the same as the device id.Justin McPherson2009-11-111-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
| | | * | | | | | gstreamer: Set the glib app name only once and do it in the backend.Justin McPherson2009-11-112-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated KDE change 1027567 by cguthrie. Glib issues a warning if this is called more than once so we ensure that's what we do. Reviewed-by: Dmytro Poplavskiy
| | | * | | | | | Gstreamer: Detect more mimetypesJustin McPherson2009-11-111-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated KDE change 1029491 by nlecureuil Reviewed-by: Dmytro Poplavskiy
| | | * | | | | | reduce the speed of CD drive to 2X while playing CD audio to limit CDJustin McPherson2009-11-111-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drive noise Integrated KDE changes 1029492, 1030905 by nlecureuil Reviewed-by: Dmytro Poplavskiy
| | | * | | | | | gstreamer: Do not call gst_deinit() but do free the device and effect ↵Justin McPherson2009-11-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manager objects on backend destruction. Integrated KDE change 1027566 by cguthrie. Normally the backend is only destroyed once when the app exists, but calling gst_deinit() means that the whole gstreamer system becomes unrecoverable. This means that if you switch backends away from gstreamer and then back again it will not work. Gstreamer devs recommend that you do not call gst_deinit() at all except in test cases. Reviewed-by: Dmytro Poplavskiy
| | | * | | | | | Remove rogue \refs from documentation.Justin McPherson2009-11-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
generated by cgit v0.12 at 2024-10-26 18:27:58 (GMT)