summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-0161-321/+599
|\
| * Test positionAt.Warwick Allison2010-06-011-0/+43
| | | | | | | | | | Task-number: QTBUG-11127 Task-number: QTBUG-11054
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-0160-320/+555
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0128-188/+323
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix example code and image Fix doc Fix some bugs in the QML Web Browser buttons Fix zoom bug in QML Web Browser demo Fix Typo Various doc fixes and improvements Document issues with rectangle border width of 1 where clipping is used Simplify selection setting. Make TextInput more like TextEdit.
| | | * Fix example code and imageBea Lam2010-06-011-0/+0
| | | |
| | | * Fix docYann Bodson2010-06-011-1/+1
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-313-226/+174
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-3125-183/+317
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Various doc fixes and improvements Document issues with rectangle border width of 1 where clipping is used Simplify selection setting. Make TextInput more like TextEdit.
| | | * | | Fix some bugs in the QML Web Browser buttonsAlan Alpert2010-05-312-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Now with fewer warnings! Also, the stop button works.
| | | * | | Fix zoom bug in QML Web Browser demoAlan Alpert2010-05-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Zooming out no longer zooms to smaller than the window size.
| | | * | | Fix TypoAlan Alpert2010-05-311-1/+1
| | | | |/ | | | |/|
| | | * | Various doc fixes and improvementsBea Lam2010-05-3112-42/+159
| | | | |
| | | * | Document issues with rectangle border width of 1 where clipping is usedBea Lam2010-05-313-2/+33
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-318-8/+39
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4
| | | * | | Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4Simon Hausmann2010-05-318-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | Integrate https://trac.webkit.org/changeset/60435 - [Qt] Escape backslashes in the .pro files by Ossi.
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-3131-36/+143
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits) Doc: Fixed an off-by-one error in an example. Fix QT_NO_TEXTHTMLPARSER Fix QT_NO_DOM Fix QT_NO_TEXTSTREAM compilation errors. Fix QT_NO_VALIDATOR compilation. Doc: Removed a misleading sentence about a class constructor. Doc: correcting docs in QDrag::exec Doc: Adding note about QDrag::exec() Revert behavior of QTextLayout::boundingRect() when line width is set Fix unreasonably large width of QTextLayout::boundingRect() Doc: replacing old image Fix compilation with stricts compilers. Fix QT_NO_DIRMODEL build error in QtDeclarative. Revert "Added native key support to QSharedMemory API." Revert "Improved documentation for QSharedMemory's key/setKey functions." Fix a simple mistake in QXmlStreamReader::atEnd() docs. Improved documentation for QSharedMemory's key/setKey functions. Added native key support to QSharedMemory API. Make test work with shadow builds again. Doc: Corrected the documentation about the compression threshold. ...
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-3142-384/+375
| | | |\ \ \ \
| | | | * | | | Fix QT_NO_TEXTHTMLPARSERTasuku Suzuki2010-05-312-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 644 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | | | * | | | Fix QT_NO_DOMTasuku Suzuki2010-05-312-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2395 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | | | * | | | Fix QT_NO_TEXTDATE compilation errors.Andreas Aardal Hanssen2010-05-315-1/+16
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 649 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | | | | * | | | Fix QT_NO_TEXTDATETasuku Suzuki2010-05-255-1/+16
| | | | | | | | |
| | | | * | | | | Fix QT_NO_TEXTSTREAM compilation errors.Tasuku Suzuki2010-05-317-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 647 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | | | * | | | | Fix QT_NO_VALIDATOR compilation.Tasuku Suzuki2010-05-313-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 648 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | | | * | | | | Doc: correcting docs in QDrag::execMorten Engvoldsen2010-05-311-1/+1
| | | | | | | | |
| | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Morten Engvoldsen2010-05-312-1/+27
| | | | |\ \ \ \ \
| | | | | * | | | | Revert behavior of QTextLayout::boundingRect() when line width is setEskil Abrahamsen Blomfeldt2010-05-312-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change 817469519a784b1cc84f89cb3cb84f7560874f8e, there was a behavioral change which can cause regressions, as the bounding rect of the QTextLayout would previously return the set line width when this was greater than the calculated natural text width. We revert to this behavior to avoid regressions and add an autotest for it. When the line width is not set (and si.width is equal to QFIXED_MAX), then we will still return the natural text width. Reviewed-by: Lars
| | | | | * | | | | Fix unreasonably large width of QTextLayout::boundingRect()Eskil Abrahamsen Blomfeldt2010-05-312-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no lineWidth is set on the QTextLine, the QScriptLine::width will be the maximum value that can be represented by QFixed, thus always overriding the width of the bounding rect. The lineWidth of the QTextLine should never be used as the width of the bounding rect, since it's not a calculated value. The real bounding rect is found by querying the natural text width. Task-number: QTBUG-11104 Reviewed-by: Rhys Weatherley
| | | | * | | | | | Doc: Adding note about QDrag::exec()Morten Engvoldsen2010-05-311-1/+3
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding note to the QDrag::exec docs alerting the user about Windows speciffic behaviour. Task-number: QT-640
| | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Morten Engvoldsen2010-05-314-1/+11
| | | | |\ \ \ \ \
| | | | | * | | | | Fix compilation with stricts compilers.Olivier Goffart2010-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base class is type-dependent. One must not use unqualified-id to access base member. Reveiwed-by: Roberto Raggi
| | | | | * | | | | Fix QT_NO_DIRMODEL build error in QtDeclarative.Tasuku Suzuki2010-05-313-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> Merge-request: 652 Merge-request: 652 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | | | * | | | | | Doc: replacing old imageMorten Engvoldsen2010-05-311-0/+0
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1520
| | | | * | | | | Revert "Added native key support to QSharedMemory API."Andreas Aardal Hanssen2010-05-317-123/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9b4ff3deb28b3d642dc4480207f2f23841cf26e9.
| | | | * | | | | Revert "Improved documentation for QSharedMemory's key/setKey functions."Andreas Aardal Hanssen2010-05-311-37/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 26f3dbf0e20dbaf131bbbb35440b1ecb40b3f405.
| | | | * | | | | Fix a simple mistake in QXmlStreamReader::atEnd() docs.Robin Burchell2010-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 655 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | | | * | | | | Improved documentation for QSharedMemory's key/setKey functions.Andreas Aardal Hanssen2010-05-311-27/+37
| | | | | | | | |
| | | | * | | | | Added native key support to QSharedMemory API.Mirko Damiani2010-05-317-65/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods setNativeKey() and nativeKey() were added to QSharedMemory API. Shared memory's native key is returned by nativeKey() and it is set with either setKey() or setNativeKey(). setKey() leads to a native key that is platform independent while setNativeKey() directly sets the native key without any mangling. When using setNativeKey(), key() returns a null string and shared memory's system semaphore is not set. This means that is up to the user to define a such protection mechanism (i.e. lock() can't be used on native keys). QSharedMemory tests were updated. Merge-request: 1497 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | | | * | | | | Make test work with shadow builds again.Andreas Aardal Hanssen2010-05-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken by 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c, which assumes the binary and sources are in the same directory. The fix reverts the code back to how it was in 4.5 (where it still works with shadow builds). Reviewed-by: Denis Dzyubenko
| | | * | | | | | Doc: Fixed an off-by-one error in an example.David Boddie2010-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Task-number: QTBUG-10854
| | | * | | | | | Doc: Removed a misleading sentence about a class constructor.David Boddie2010-05-311-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Task-number: QTBUG-10479
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-28233-1772/+3159
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-276-99/+114
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-264-1/+98
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Doc: Corrected the documentation about the compression threshold.David Boddie2010-05-261-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-311-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove stray debug
| | | * | | | | | | | | Remove stray debugThomas Zander2010-05-311-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-313-226/+174
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix multithreaded use of bearer management on Symbian. Fix up cancelling of active object. Fix locking after merge from Qt Mobility.
| | | * \ \ \ \ \ \ \ \ \ Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-05-31198-1507/+2441
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix multithreaded use of bearer management on Symbian.Aaron McCarthy2010-05-312-80/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move more initialization code into initialize() function. The constructor for the SymbianEngine class can be called from any thread. Move all initialization into initialize() function which is guarinteed to be run in the main thread. This is required as some Symbian resources are not shared between thread in the same process. The implementation of the defaultConfiguration() function could only be called from the main thread. Cache a copy of the default network configuration when the configurations are updated and just return this when the defaultConfiguration() function is called. Only lock the engine mutex from external entry points. Remove need for locking in waitRandomTime() function. Prevents dead lock due to nested event loop. Task-number: QTBUG-10296
| | | * | | | | | | | | | | Fix up cancelling of active object.Aaron McCarthy2010-05-311-44/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10296
generated by cgit v0.12 at 2024-12-06 01:09:16 (GMT)