summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.6'Olivier Goffart2009-12-15176-1762/+4884
|\ | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * def file maintenance.Rohan McGovern2009-12-151-1/+1
| |
| * Fixed compile for S60 (.def file updates).Rohan McGovern2009-12-151-45/+47
| | | | | | | | | | More private API changes, and mark QEgl symbols as ABSENT so compilation is not broken when OpenVG is disabled.
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Justin McPherson2009-12-1477-824/+2000
| |\
| | * Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-1475-822/+1953
| | |\
| | | * Determine QPrinterInfo's supportedPaperSizes on demand.David Faure2009-12-141-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The paper size determination requires a cupsGetPPD(), which can be a slow HTTP download. So doing it on demand makes QPrinterInfo::defaultPrinter() much faster, because it doesn't actually need the paper sizes at all. Before this fix, it was requesting the PPD file of every known CUPS printer, every time it was called. My battery of unittests for code that uses QPrinter went from 19 minutes when the cups print server is switched off, to 13 seconds! This fix also removes some code duplication, which is always nice. Task-number: 232664, QTBUG-3033 Reviewed-by: Trond
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-143-4/+5
| | | |\
| | | | * Stabilize testOlivier Goffart2009-12-142-2/+3
| | | | |
| | | | * Fix warning in public headerOlivier Goffart2009-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qcache.h:73: warning: declaration of 'object' shadows a member of this Spotted by compilerwarnings autotest Reviewed-by: Thiago
| | | * | Added vg to the performance section of the QPainter docsGunnar Sletta2009-12-141-0/+6
| | | |/
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-1417-14/+1065
| | | |\
| | | | * Fixes cursor blinking in the QComboBox when it becomes editable while having ↵Olivier Goffart2009-12-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the focus. The lineedit has the focus because it becomes focusproxy of the QComboBox. But the focusInEvent is not called because the combobox has already the focus when setFocusProxy is called. Workaround that in the show event. Task-number: QTBUG-1949 Reviewed-by: Thierry
| | | | * Add missing benchmark to the benchmarks.proOlivier Goffart2009-12-111-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not add the benchmark that runs too slowly. Reviewed-by: jasplin
| | | | * Itemviews: we needed to call ensurePolishedwhen asking for sizehintsThierry Bastian2009-12-112-0/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Pierre Rossi
| | | | * Fixes Graphicsitem transformation problems when grouping/ungrouping.Yoann Lopes2009-12-119-2/+989
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New transformation properties added in 4.6, such as rotation or transformOriginPoint were not taken into account in addTogroup and removeFromGroup. Autotest and manual test included. Task-number: QTBUG-5071 Reviewed-by: bnilsen
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-12-114-5/+89
| | | | |\
| | | | | * Fixed invalid read in QCache::unlink after recent change.Samuel Rødal2009-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to store a pointer to the object in order to delete it later, since the node containing the pointer will be deleted when removing it from the hash. Reviewed-by: Jan-Arve Sæther
| | | | * | Add a simple check for a common wrong usage to avoid infinite recursionJan-Arve Sæther2009-12-113-10/+40
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Alexis
| | | * | | Fixed spelling in docsGunnar Sletta2009-12-141-6/+6
| | | | |/ | | | |/|
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-11107-1124/+1519
| | | |\ \
| | | | * | Fixed qgraphicseffectsource autotest.Samuel Rødal2009-12-112-4/+9
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent crashing when asking for a source pixmap in logical coordinates and PadToEffectiveBoundingRect mode. Also, change the expected values for the test that uses LogicalCoordinates and PadToEffectiveBoundingRect mode to reflect that the boundingRectFor() function applies padding in device coordinates (and in this case there is a scale by 2 when drawing the effect). Reviewed-by: Bjørn Erik Nilsen
| | | | * Prevented leak of keys in QPixmapCache.Samuel Rødal2009-12-103-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing a pixmap from the pixmap cache using the new QPixmapCache::Key API left the keys dangling in the QCache's internal QHash. The problem is that the Key is invalidated as soon as the QPixmapCacheEntry is destroyed, thus removing it from the hash failed. Reordering the destruction of the object and the removal of the key in QHash fixes the problem. Reviewed-by: Alexis Reviewed-by: Thiago
| | | | * Optimize our GL extension checks to avoid mallocs.Trond Kjernåsen2009-12-103-35/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to avoid any unnecessary mallocs when checking GL/GLX extensions. The GL extension string can be quite long and contain several hundred extensions. The old code forced one malloc for each extension + 1 extra malloc for the extension string itself when it was copied into the QByteArray. Reviewed-by: Kim
| | | | * Fix redraw bugs when using graphics effects in device coordinate mode.Samuel Rødal2009-12-107-14/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsEffect::boundingRectFor() needs the source bounding rect in device coordinates. This patch fixes the documentation to reflect this, and fixes some internal usage of boundingRectFor() to ensure it always gets the device rect of the source. Task-number: QTBUG-5918 Reviewed-by: Bjørn Erik Nilsen
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-106-3/+34
| | | | |\
| | | | | * Fixes internal drag and drop in QListWidget while dropping to the endOlivier Goffart2009-12-102-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6565 Reviewed-by: Gabriel
| | | | | * Fix spinbox input when seecting the prefixThierry Bastian2009-12-102-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you were selcting the prefix and entering a digit the cursor position would not be updated correctly Task-number: QTBUG-6670 Reviewed-by: ogoffart
| | | | | * Doc: The ctor of of QGraphicsLayout might install the layout.Jan-Arve Sæther2009-12-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6447
| | | | | * Doc: Try to explain better when and how the easing curve is appliedJan-Arve Sæther2009-12-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maybe not perfect, but it should be *better* at least. Task-number: QTBUG-6623 Reviewed-by: Thierry
| | | | * | Clean up the QFontEngine glyphcaching code to not crash and be more tidyGunnar Sletta2009-12-104-119/+32
| | | | |/ | | | | | | | | | | | | | | | Reviewed-by: Eskil
| | | | * Recreate VGImage properly in out of memory caseRhys Weatherley2009-12-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If vgCreateImage() runs out of memory, then the drawPixmap() will fail. But previously, it would also prevent future attempts to call vgImageSubData() to populate the data when memory was present. Task-number: QTBUG-6639 Reviewed-by: Sarah Smith
| | | | * Fix a crash on the focus chain when removing items from the scene.Alexis Menard2009-12-095-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash was because of the dangling pointer set on the tabFocusFirst attribute in QGraphicsScene. A child which was the tabFocusFirst was removed from the scene and fixFocusChainBeforeReparenting was setting the new tabFocusFirst pointer to the parent (since in that example it was the focusNext) but later on the parent was removed also from the scene (due to the recursion of removeItem if you call it with the parent : first children, then the parent itself) and fixFocusChainBeforeReparenting was not called again so if you delete the parent then the scene has the dangling pointer set. Task-number:QTBUG-6544 Reviewed-by:janarve
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-0976-939/+1195
| | | | |\
| | | | | * Fixed a regression in dock widget resizingThierry Bastian2009-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It could happen that they grow much more than the movement of the mouse Task-number: QTBUG-6499 Reviewed-by: gabi
| | | | | * GLES 2 should *not* use a multisampled format by default.Trond Kjernåsen2009-12-092-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a platform regression and should never have been there in the first place. Having this as the default format on embedded devices may drop the framerates with as much as 30% on selected HW. Reviewed-by: Tom Cooksey
| | | | | * Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-0910-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
| | | | | * Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-12-0951-390/+764
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| | | | | * | Use 64bit for the connectedSignalsOlivier Goffart2009-12-093-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as QML objects may have lots of signals Do not use quint64 as it would produce lots of useless padding on MSVC 32bit Reviewed-by: Brad
| | | | | * | Fix regression in qVariantFromValue when converting from complex type to ↵Olivier Goffart2009-12-092-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simple type QVariant v = QColor(Qt::red); v.setValue(1000); Would produce a variant with garbage. the destructor of QColor would not be called, and the 1000 would be in the QVariant::PrivateShared, while most of the QVariant code assume that numbers are dirrectly in the QVariant::Data union Task-number: QTBUG-6602 Reviewed-by: Thierry
| | | | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵axis2009-12-096-97/+78
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | | * | Clean up debug message with DirectFBAnders Bakken2009-12-091-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some superfluous spaces. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | | | * | Enable customizing of DirectFB layer to useAnders Bakken2009-12-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables you to use a different layer for Qt apps by specifying: E.g. QWS_DISPLAY=directfb:layerid=2 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | | | * | Set stacking class for stays-on-top windows in DFBAnders Bakken2009-12-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For better compatibility with non-QWS DirectFB apps running in the same session we should set the stacking class of Windows that have the StaysOnTop flag set. This corresponds nicely to DWSC_UPPER. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| | | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-087-500/+340
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | | * | | Def file updatesShane Kearns2009-12-082-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | | | * | | Implement qsrand() for Symbian OSShane Kearns2009-12-081-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After checking the source code of OpenC stdlib, rand and srand are thread safe (they use Symbian's TLS internally) so the Symbian implementation mostly follows the Windows one (where this is also true) Task-number: QTBUG-6372 Reviewed-by: Janne Koskinen
| | | | | | * | | Crash: when opening the File Dialog in Media Player (armv5)Sami Merilä2009-12-084-470/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to NGA API changes in Tb9.2. Because of API changes, S60Style needs to have a lot of internal changes. First, the changed style no longer itself tries to uncompress and handle CFbsBitmaps, but instead uses the QPixmap backend for it. Second, all references to CFbsBitmap::DataAddress() have been removed. Third, the lookup table for theme parts has been cleaned up. Task-number: QTBUG-4644 Reviewed-by: Janne Koskinen
| | | | * | | | | Fix crash when rotating cleartype text under gl engine.Gunnar Sletta2009-12-095-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil
| | | | * | | | | Don't assert on valid math in qbezierGunnar Sletta2009-12-091-2/+0
| | | | | |_|/ / | | | | |/| | |
| | | * | | | | Initial documentation for the performance characteristics of QPainter.Gunnar Sletta2009-12-111-0/+78
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Tom
generated by cgit v0.12 at 2024-11-24 23:50:29 (GMT)