summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'hfw_2nd' into 4.7Jan-Arve Sæther2010-08-117-19/+682
|\
| * Fix (implement!) hfw/wfh in QGridLayoutEngineJan-Arve Sæther2010-08-105-17/+678
| | | | | | | | | | | | | | | | Note that only height-for-width works, since we cannot add QSizePolicy::hasWidthForHeight() in a patch release. Task-number: QT-3570 Reviewed-by: Paul
| * Fixed a bug in implementation of sizeHint() when there was a constraintJan-Arve Sæther2010-08-102-2/+4
| | | | | | | | | | | | | | | | The constraint was not adjusted with the margins before passing it on to the engine (which is unaware of the margins). Task-number: Found during QT-3570 Reviewed-by: Paul
* | Layout items had the wrong size if the layout was resized to maximum.Jan-Arve Sæther2010-08-112-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | The problem was that if targetSize was the layouts maximum size, then sumAvailable could be reduced to exactly 0 in the "while (keepGoing)" loop. That would mean that we would not enter the block that actually copied the new sizes from the temporary "newSizes" array to the output "sizes" array due to the "if (sumAvailable > 0)" condition. Task-number: none, discovered while fixing QT-3570 Reviewed-by: Frederik Gladhorn
* | Disable minRightBearing optimization in QTextLayout on MacEskil Abrahamsen Blomfeldt2010-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | Neither of the Mac font engines have implemented minimum right bearing, which will cause them to return 0 for the minimum value. This will cause the right bearing to never be calculated prior to breaking and thus never be a part of the breaking width. Since actually implementing the functions is too time consuming for right now, we will disable the optimization for the time being. Reviewed-by: Olivier
* | Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-11107-4850/+10499
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-10108-4862/+10509
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fix memory leak in QtScript variable object doc: Changed some titles so lists of contents sort better. QSslSocket: fix security vulnerability with wildcard IP addresses doc: Some reorganization of top page topic hierarchy. Mac: Fix crash when using style to draw on other things than widgets Doc: Adding radius support for CSS3 and webkit Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression add performance comparisons to qregexp benchmark configure: fix error message when calling config.status Fix invalid memory write during recursive timer activation Added comment about calendarPopup in setCalendarWidget function documentation. doc: Fixed some qdoc errors. Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. XmlListModel doc fixes Mention QML_IMPORT_TRACE in Modules docs Merge sections about when property and default state Explain Flipable example further PathView required some diagonal movement before a drag was initiated. doc: Fixed some qdoc errors. ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-10108-4862/+10509
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fix memory leak in QtScript variable object doc: Changed some titles so lists of contents sort better. QSslSocket: fix security vulnerability with wildcard IP addresses doc: Some reorganization of top page topic hierarchy. Mac: Fix crash when using style to draw on other things than widgets Doc: Adding radius support for CSS3 and webkit Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression add performance comparisons to qregexp benchmark configure: fix error message when calling config.status Fix invalid memory write during recursive timer activation Added comment about calendarPopup in setCalendarWidget function documentation. doc: Fixed some qdoc errors. Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. XmlListModel doc fixes Mention QML_IMPORT_TRACE in Modules docs Merge sections about when property and default state Explain Flipable example further PathView required some diagonal movement before a drag was initiated. doc: Fixed some qdoc errors. ...
| | * | Fix memory leak in QtScript variable objectKent Hansen2010-08-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The d-pointer is of type JSVariableObjectData*, but JSVariableObjectData doesn't have a virtual destructor. Hence we must cast the d-pointer to our subclass when deleting. In particular, this will ensure that the destructor of the symbolTable member is called, which will deallocate the table storage. (For QScriptActivationObject this did not cause a leak in practice, because its symbolTable is always empty, and JSC's hash table uses lazy allocation.) Task-number: QTBUG-12479 Reviewed-by: Olivier Goffart
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-102-0/+7
| | |\ \
| | | * | QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-102-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore <rich@kde.org> Task-number: QT-3704
| | * | | doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-1014-23/+24
| | |/ /
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-102-0/+19
| | |\ \
| | | * | Mac: Fix crash when using style to draw on other things than widgetsRichard Moe Gustavsen2010-08-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When drawing a complex control using the style, you are allowd to skip giving a widget as the last argument. But when doing so, it caused a crash in the mac style. Reviewed-by: Fabien Freling
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-1025-61/+127
| | | |\ \
| | | * | | Doc: Adding radius support for CSS3 and webkitMorten Engvoldsen2010-08-101-0/+16
| | | | | |
| | * | | | doc: Some reorganization of top page topic hierarchy.Martin Smith2010-08-107-18/+17
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1083-4819/+10440
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression add performance comparisons to qregexp benchmark configure: fix error message when calling config.status Fix invalid memory write during recursive timer activation Added comment about calendarPopup in setCalendarWidget function documentation. doc: Fixed some qdoc errors. Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. XmlListModel doc fixes Mention QML_IMPORT_TRACE in Modules docs Merge sections about when property and default state Explain Flipable example further PathView required some diagonal movement before a drag was initiated. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0. doc: Fixed some qdoc errors. Add Ukrainian translation. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. ...
| | | * | Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regressionBradley T. Hughes2010-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit eea84818e98af917d3cf2bf04ea17a416ef9d55e corrected some spelling mistakes, one of which this test was relying on. Reviewed-by: trustme
| | | * | add performance comparisons to qregexp benchmarkArvid Ephraim Picciani2010-08-103-1/+320
| | | | | | | | | | | | | | | | | | | | Reviewed-by: hjk
| | | * | configure: fix error message when calling config.statusJoerg Bornemann2010-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling configure in a shadow build directory led to error messages when trying to delete the content of $$QT_BUILD_TREE/mkspecs. Task-number: QTBUG-12764 Reviewed-by: ossi
| | | * | Fix invalid memory write during recursive timer activationBradley T. Hughes2010-08-093-20/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handler for one timer recurses the event loop, and the handler for another timer removes the first timer, returning from the recursion and the handler for the first timer causes an invalid write (since the timer info for the first timer has been deleted). Fix this by keeping an active reference in QTimerInfo (instead of just a bool inTimerEvent). If this is non-zero, the timer is currently being delivered, so we prevent more delivery. When a timer is removed and it's activateRef is set, we clear it so that the delivery code knows now to write to memory that's already been freed. A side effect of this change is that we no longer need to track the currentTimerInfo "globally" anymore, it can be a normal local variable in the QTimerInfoList::activateTimers() function. Task-number: QT-3553 Reviewed-by: olivier Reviewed-by: joao
| | | * | Added comment about calendarPopup in setCalendarWidget function documentation.Jerome Pasion2010-08-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: David Boddie Task: QTBUG-12300
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-0945-87/+134
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-0932-87/+9801
| | | | |\ \
| | | | | * | CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.Carlos Manuel Duclos Vergara2010-08-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That code is deprecated for the most part, however under certain circumstances could be run. The fix is to check the value when using the deprecated code and change the return value to follow the logic of the new code. Task-number: QTBUG-12732 Reviewed-by: João Abecasis
| | | | | * | XmlListModel doc fixesBea Lam2010-08-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12749
| | | | | * | Mention QML_IMPORT_TRACE in Modules docsBea Lam2010-08-091-0/+8
| | | | | | |
| | | | | * | Merge sections about when property and default stateBea Lam2010-08-091-36/+59
| | | | | | |
| | | | | * | Explain Flipable example furtherBea Lam2010-08-091-4/+10
| | | | | | |
| | | | | * | PathView required some diagonal movement before a drag was initiated.Martin Jones2010-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any movement beyond the threshold is sufficient. Task-number: 12747 Reviewed-by: Joona Petrell
| | | | * | | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-0939-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938
| | | * | | | doc: Fixed some qdoc errors.Martin Smith2010-08-093-9/+8
| | | | | | |
| | | * | | | doc: Fixed some qdoc errors.Martin Smith2010-08-091-1/+1
| | | | |/ / | | | |/| |
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-2/+2
| | | |\ \ \
| | | | * | | OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0.Christian Kamm2010-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we would try to create one with samples = 1 anyway, potentially resulting in an INVALID_VALUE error. Task-number: QTBUG-12757 Reviewed-by: Samuel Rødal
| | | * | | | doc: Fixed some qdoc errors.Martin Smith2010-08-092-7/+1
| | | |/ / /
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-096-0/+9667
| | | |\ \ \
| | | | * | | Add Ukrainian translation.Victor Ostashevsky2010-08-096-0/+9667
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 761 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | | | doc: Fixed some qdoc errors.Martin Smith2010-08-093-4/+4
| | | |/ / /
| | | * | | doc: Fixed some qdoc errors.Martin Smith2010-08-098-17/+22
| | | | | |
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-4/+4
| | | |\ \ \
| | | | * | | Doc: removing reduntant text from the index pageMorten Engvoldsen2010-08-091-4/+4
| | | | | | |
| | | * | | | doc: Fixed some qdoc errors.Martin Smith2010-08-094-5/+5
| | | |/ / /
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750Jerome Pasion2010-08-091-1/+1
| | | | | |
| | | * | | doc: Fixed some qdoc errors.Martin Smith2010-08-095-6/+7
| | | |/ /
| | | * | doc: Fixed some qdoc errors.Martin Smith2010-08-091-63/+1
| | | | |
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-095-4629/+278
| | | |\ \
| | | | * | I18N: Update German translations for 4.7.0.Friedemann Kleint2010-08-095-4629/+278
| | | | | |
generated by cgit v0.12 at 2024-11-09 02:17:54 (GMT)