summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into 4.6-ceninerider2009-11-2342-230/+693
|\
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-2314-12/+135
| |\
| | * Support semi-transparent surfaces in the OpenVG graphics systemRhys Weatherley2009-11-223-3/+41
| | | | | | | | | | | | | | | Task-number: QT-2026 Reviewed-by: Jason Barron
| | * Fixes painting issues when scaling a QGraphicsView.Yoann Lopes2009-11-202-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the 'exposed rectangle' passed to the Item's paint() function was rounded to Int values, whereas the one passed to drawBackground and drawForeground was not. Autotest included. Task-number: QTBUG-5859 Reviewed-by: bnilsen
| | * Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-2071-430/+630
| | |\
| | * | Revert "Do not extend the last toolbar in a line when moving it"Thierry Bastian2009-11-202-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | make a real fix for the problem is defaulting to sizehint when there is no preferred size set (ie the toolbar hasn't been moved) This reverts commit a2c247ed521d88f99a21b4207cdff8ea03e949be.
| | * | Do not extend the last toolbar in a line when moving itThierry Bastian2009-11-202-5/+7
| | | |
| | * | Q_ASSERT failure when resizing a span to (1,1) in 1st cellGabriel de Dietrich2009-11-202-1/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Task-number: QTBUG-6004
| | * | Fixed antialiasing in the GL based QGraphicsView demos under X11.Trond Kjernåsen2009-11-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the examples/demos that used a QGraphicsView with a QGLWidget as a viewport, that had multisampling enabled, was broken after 7b61fbf03e170a7da37d5f57ed4053aae719ec7f. This is because the reparented QGLWidget will be forced to use the parent widget's visual, which in this case does not contain any multisample buffers. The QX11Info structure for QGLWidget is put together based on the QGLFormat that is passed into the QGLWidget constructor and will in most cases always be different from the parent widget visual. Task-number: QTBUG-5998 and QTBUG-6003 Reviewed-by: Eskil
| | * | avoid possible crash when showing a modal dialog from a widget destructorThierry Bastian2009-11-202-2/+28
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5804 Reviewed-by: denis
| | * | Fix for tabwidget usesScrollButton being overriden by stylesheetOlivier Goffart2009-11-203-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting a stylesheet or reparenting a widget into a widget using style sheet would cause the usesScrollButtons to be reset. Instead we now keep the flag whenever it has been explicitly set by the user rather than querying from the style again. Task-number: QTBUG-3370 Reviewed-by: jbache
| * | | Merge commit 'b7692016f282251002b3e85dfcb5567bd91a12c0' of oslo-staging-1 ↵Simon Hausmann2009-11-235-5/+132
| |\ \ \ | | | | | | | | | | | | | | | into 4.6
| | * | | Fix regression introduced in 1e6b424b692b20dcfec920f8d3563e520ec1ff05João Abecasis2009-11-202-1/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When processing the result of QIODevice::readLine, forgot to take into account that a '\0' is appended to the array. The terminating character is not accounted for in the number of bytes returned. By pre-allocating a byte for the terminating null character, we make sure we'll actually read 16k bytes on each and every iteration. Task-number: QTBUG-6019 Reviewed-by: Thiago Macieira
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-11-2039-308/+372
| | |\ \ \
| | | * | | Incorrect DropAction returned by QDrag::exec() on Cocoa.Prasanth Ullattil2009-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The action performed by the latest drag and drop operation is stored in the global DnDParams structure. The QDrag::exec() return value has to be fetcted from this global variable instead of the temporary copy on stack. Commit 0d231c32cc7670d356d486b13648cb5bd471ffef broke this. Task-number: QTBUG-6001 Reviewed-by: Denis
| | | * | | Marking the shmid segment to be destroyed. It prevents leaks when the app ↵Simone Fiorentino2009-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crashes Merge-request: 2080 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | * | | | doc: Fixed the last qdoc errors (this time).Martin Smith2009-11-201-3/+12
| | | | | |
| * | | | | Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 ↵Simon Hausmann2009-11-2311-170/+322
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | into 4.6
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-2037-307/+369
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Revert check for file size to a warning in QFile::mapJoão Abecasis2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check, introduced in c66de8a19b558e14097c402480eeabf0b5ec2351, changes behavior and it is not clear whether we should prevent mmaping beyond EOF. FWIW, python prevents it. Leaving a warning in there for now so as not to break applications that depend on the feature. Task-number: QTBUG-6008 Reviewed-by: Thiago Macieira
| | * | | | Fixing the frame hierarchy traversing in framecapture WebKit example.Andre Pedralho2009-11-192-21/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2142 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | | | Updated the 'framecapture' WebKit example according to WebKit API changes.Andre Pedralho2009-11-192-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2142 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | | | Document known issue - window resizing slower on Windows 7 due to gestureVolker Hilsheimer2009-11-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | initialization process creating window handles.
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-11-19422-3776/+13656
| | |\ \ \ \
| | | * | | | Doc: Adding documentation on Embedded Hardware accelerationMorten Engvoldsen2009-11-195-144/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added "best practice" page on HW acc for mebedded. Modified HW acc docs. Adding Hello GL ES for Wince to the list of examples. QTBUG-5791 David Boddie
| | * | | | | doc: Added note about including a 3rd party library in the bundle.Martin Smith2009-11-191-1/+7
| | | | | | |
| * | | | | | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-11-2313-43/+104
| |\ \ \ \ \ \
| | * | | | | | don't use qWarning for things which are not really warningsOswald Buddenhagen2009-11-202-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... so the tools are usable with QT_FATAL_WARNINGS. it may be sensible to "degrade" the c++ parser warnings to info messages. possibly later ... Task-number: QTBUG-5683
| | * | | | | | fix crash on closing "rightmost" fileOswald Buddenhagen2009-11-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "This cannot happen" ... yeah, right. :} Task-number: QTBUG-5989
| | * | | | | | fix encodings, take NOswald Buddenhagen2009-11-2010-32/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4499 Task-number: QTBUG-5276
| | * | | | | | don't overwrite explicitly specified CODECFORTR on UTF-16 inputOswald Buddenhagen2009-11-193-2/+3
| | | | | | | |
| | * | | | | | fix potentially wrong output codec for UTF-16 input filesOswald Buddenhagen2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | querying the actual codec before the file has been read is pointless
* | | | | | | | WinCE: only use native menu bars for windows mobileninerider2009-11-231-0/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows CE the native menubar must not be used. The corresponding flag was never set for Windows CE. Task-number: QT-2530 Reviewed-by: Maurice
* | | | | | | Fix configure warning for non-symbian buildsJason McDonald2009-11-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure complains about "Could not retrieve HKEY_LOCAL_MACHINE\Software\Symbian\EPOC SDKs setting". It should only try to do that for Symbian builds. Reviewed-by: Lincoln Ramsay
* | | | | | | Mention the changed architecture and license of QtScript in the 4.6.0 changelogSimon Hausmann2009-11-201-0/+2
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen
* | | | | | Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-2035-136/+360
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | 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
| |\ \ \ \ \ \
generated by cgit v0.12 at 2025-01-23 14:03:45 (GMT)