summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' into mmfphononFrans Englich2009-11-20575-6352/+18797
|\ | | | | | | | | Conflicts: demos/qmediaplayer/mediaplayer.cpp
| * Add support for opening Real Media RAM files.Frans Englich2009-11-202-0/+49
| | | | | | | | | | | | | | | | Requested by Nokia Dallas/Helix team. Patch supplied by Fu Liz EXT-DextraTech/Dallas, minor changes by me. Task-number: QTBUG-4882 Reviewed-by: Gareth Stockwell
| * Docs: Symbian: correct capabilities wrt. Helix Phonon plugin.Frans Englich2009-11-201-5/+2
| | | | | | | | Reviewed-by: Gareth Stockwell
| * Symbian: Add capability NetworkServices.Frans Englich2009-11-201-0/+2
| | | | | | | | | | | | From discussions with Helix team. Reviewed-by: Gareth Stockwell
| * Fix ICON keyword to work with absolute paths also in SBSv2.Janne Anttila2009-11-201-1/+4
| | | | | | | | | | Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-2030-95/+467
| |\ | | | | | | | | | 4.6-staging2
| | * Improved documentation Qt for the Symbian platformAlessandro Portale2009-11-1914-70/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Janne Anttila: - Switched links/references from 'S60' to 'Symbian' - Added collection page for Symbian specific documentation - Added page about application deployment for Symbian - Update supported compiler list for Symbian to more specific one - Added bullet about dev env. setup to Symbian installation page - Commented that SBSv2 is not offically supported by current S60 SDKs - Moved S60 3rd FP1 special patching note after SDK installation bullet - Recommedation to look into Qt quick start guide from Symbian Forum - Added Symbian bullet to known issues page and link to wiki - Added link to "state of support" document from symbian docs main page By aportale: - Rephrasing - More consistent naming of 'Qt for the Symbian platform' - Implementation of suggestions from other Nokians Reviewed-By: Janne Anttila
| | * 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-193-0/+20
| | | | | | | | | | | | | | | | | | | | | 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
| | * Enabled Qt icon in Symbian also for demos/examples without UID3.Janne Anttila2009-11-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ICON keyword can be used without UID, since .mif filename is generated based on target instead of UID3 nowadays Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen
| | * Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-193-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0. It can be reverted now since mifconv invoking is changed to use relative paths instead of absolute one. Task-number: QTBUG-4745 Reviewed-by: TrustMe
| | * Use relative paths when invoking mifconv.Janne Anttila2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some S60 SDK has a bug which make mifconv to crash with absolute paths. Switched to use QMAKE_FILE_IN variable in mifconv.commands instead of using join of ICON keywords. Joining is not needed anymore since ICON keyword supports only one filename. Using input variable (QMAKE_FILE_IN) also esnures that absolute path is converted to relative before invoking mifconv. Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
| | * Unified ICON keyword handling for ABLD and SBSv2 toolchains.Janne Anttila2009-11-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With SBSv2 toolchain only first file from ICON keyword is used and it is actually the right behaviour. Originally support for multiple files in ICON keyword was introduced to support localized application icons. However, in that case the different localized icons should not go to same MIF file since it is not possible to define in .rss file which icon number should be used for which language. To support a localized application icons separate MIF for each locale should be created and installation of ICON should depend on selected language. Implementing proper support for localized icons is left for another task. Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
| * | 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
| * | Add a QTest::qWaitForWindowShown for a failing qlistview autotestLeonardo Sobral Cunha2009-11-191-0/+2
| | | | | | | | | | | | Reviewed-by: trustme
| * | On main window, the sizegrip visibility was not correctly updatedThierry Bastian2009-11-192-8/+35
| | | | | | | | | | | | | | | Task-number: QTBUG-4334 Reviewed-by: ogoffart
| * | Fixes: QCommandLinkButton crop large icons.Olivier Goffart2009-11-192-8/+39
| | | | | | | | | | | | | | | Task-number: QTBUG-1976 Reviewed-by: Gabi
| * | Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-1985-738/+10307
| |\ \
| | * \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-19237-2013/+1773
| | |\ \
| | * | | Fixed Multi-length strings not implemented for float functionsOlivier Goffart2009-11-192-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | doc: Removed google search engine.Martin Smith2009-11-191-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The google search engine for the doc tree must be generated after the doc tree has been built. The google search engine for the doc tree should only appear in the online docs.
| | * | | French translation of designerBenjamin Poulain2009-11-182-0/+7047
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Pierre Rossi
| | * | | Updates the french translation of qt strings in qt_fr.tsPierre Rossi2009-11-182-116/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also took care of placing non breakable spaces before double punctuation characters. Reviewed-by: Benjamin Poulain
| | * | | Fixes duplicate accelerators in french translation of assistantYoann Lopes2009-11-181-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also put non breakable spaces in front of characters such as ':', '!' and '?' Reviewed-by: Pierre Rossi
| | * | | 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
| | * | | Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browser demo isn't currently compiling for Symbian GCCE builds because ARMV5 built static uitools.lib apparently isn't compatible with linking into GCCE application. Removed the browser from Symbian builds as a hotfix for 4.6.0. Task-number: QTBUG-5692 Reviewed-by: Janne Anttila (cherry picked from commit 31d29b227a7609ab0dadca4244cafec919264ba8)
| | * | | Symbian docs: Repair some documentation damage, remove obsolete file.Frans Englich2009-11-183-47/+24
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | Incorporate feedback from marketing.Frans Englich2009-11-182-111/+83
| | | | |
| | * | | Symbian support: incorporate feedback from Lars.Frans Englich2009-11-181-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Espen Riskedal Reviewed-by: Frans Englich
| | * | | Complement Phonon for Symbian documentation.Frans Englich2009-11-182-2/+10
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Gareth Stockwell
| | * | | Incorporate feedback by Espen.Frans Englich2009-11-181-24/+33
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Espen Riskedal
| | * | | Fix typo.Frans Englich2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | Document the state of support in Symbian.Frans Englich2009-11-182-1/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The content was compiled primarily by asking the members of the S60 team. Reviewed-by: David Boddie
| | * | | 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-187-122/+129
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-17191-2790/+3615
| | | |\ \ \
| | | * | | | 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-172-56/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | Improve reliability of QFile test readAllStdinJoão Abecasis2009-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by catching failure to launch separate process earlier.
| | | * | | | Fix regression introduced in c08e708037d33271825ce6a6a1ac640e96b70c36João Abecasis2009-11-172-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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