summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-11-18390-12069/+9055
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | QToolbar should fill available width on SymbianSami Merila2010-11-181-0/+50
| | | | * | | | | | | | | | | | | | | Improve performance of hfw in qgridlayoutengine by adding more caching.Jan-Arve Sæther2010-11-194-11/+165
| | | | | |_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | QS60Style: Null pointer crash when using itemviews in some casesSami Merila2010-11-191-4/+5
| | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-17390-12069/+9055
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | / / / / | | | | | |_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-161-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-15193-1594/+1885
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Adhere to code styleJan-Arve Sæther2010-11-152-5/+5
| | | * | | | | | | | | | | | | | Some improvements to the docs that was added in merge request 894Jan-Arve Sæther2010-11-151-1/+1
| | | * | | | | | | | | | | | | | Change the QGraphics*Layout documentation to match the code - that the defaul...John Tapsell2010-11-154-4/+89
| | | * | | | | | | | | | | | | | Fix item alignment in layouts bigger than the items thay they containJohn Tapsell2010-11-154-46/+208
| | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Jan-Arve Sæther2010-11-151-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-121-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / / | | | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Add autotest to test a issue with stretches and preferred width.Jan-Arve Sæther2010-11-151-0/+62
| | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Code style cleanup for merge request 847Jan-Arve Sæther2010-11-121-4/+4
| | | * | | | | | | | | | | | | | Merge branch 'fixes-to-merge-requests' into 4.7Jan-Arve Sæther2010-11-122-57/+231
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Add back the tests that were removed by commit fcda1b785bd7d86011f49bfe96cb22...Jan-Arve Sæther2010-11-121-0/+174
| | | | * | | | | | | | | | | | | | Fix a behaviour change of sizeHint() introduced by 6d4d265e7e67dde58Jan-Arve Sæther2010-11-112-57/+57
| | | * | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-1151-218/+693
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-10306-4443/+10713
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-2213-24/+529
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1946-56/+345
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-19395-12125/+9087
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1817-584/+560
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-17390-12069/+9055
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Doc: Documented that border width does not affect rectangle geometry.David Boddie2010-11-191-0/+3
| | | * | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-17526-6294/+13909
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-161-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-15187-1579/+1842
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt QuickMorten Engvoldsen2010-11-153-2/+501
| | | | * | | | | | | | | | | | | | | | Doc: Correcting references to Qt Declarative module.Morten Engvoldsen2010-11-157-16/+16
| | | | * | | | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-156-78/+170
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-126-78/+170
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | doc: Stated that the destructor does not call close().Martin Smith2010-11-121-1/+4
| | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Doc: Minor fixes to style.David Boddie2010-11-171-2/+2
| | | * | | | | | | | | | | | | | | | | Doc: Updated the DirectFB documentation to reflect version changes.David Boddie2010-11-171-3/+3
| | * | | | | | | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-220-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-11-220-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | _ / | | | | | | | | | | | | | | | | | | /
| | | * | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-11-222-2/+22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Fixed handling of QInputMethodEvents with nonzero replacementLength.axis2010-11-192-2/+22
| | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-226-28/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Compile when USER_TIMER_MINIMUM isn't definedBradley T. Hughes2010-11-221-1/+1
| | | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-11-2265-641/+928
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-195-23/+45
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-195-23/+45
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | Fix compilation with Sun Studio 12.1.Thiago Macieira2010-11-191-2/+2
| | | | | | * | | | | | | | | | | | | | | Compile with QT_NO_PROXYSCREEN.Sam Magnuson2010-11-191-0/+2
| | | | | | * | | | | | | | | | | | | | | silence compiler warningsHarald Fernengel2010-11-192-7/+7
| | | | | | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-181-14/+34
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | | | | |/| | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | Don't let posted events starve native dialogs (regression)Bradley T. Hughes2010-11-181-14/+34