summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-11-242-0/+8
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-242-0/+8
| |\
| | * Fix compliation of ALSA audio backend when checking for surround support.Justin McPherson2010-11-242-0/+8
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-2410-75/+124
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-2210-75/+124
| |\ \
| | * | tst_qthread: fix compilationOlivier Goffart2010-11-221-1/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-2210-75/+123
| | |\ \
| | | * | Round origin of text in OpenVG engineEskil Abrahamsen Blomfeldt2010-11-221-2/+2
| | | * | QThread::exec(): Fix possibility to enter several time the event loopOlivier Goffart2010-11-222-1/+43
| | | * | QMessageBox: change the documentation to reflect that it is application modalOlivier Goffart2010-11-221-58/+30
| | | * | Compile on OpenBSDOlivier Goffart2010-11-221-3/+10
| | | * | Doc: Q_PROPERTY, implements the setter/getter in the exampleOlivier Goffart2010-11-222-5/+19
| | | * | Dynamically register the event number.Michael Dominic K2010-11-222-6/+18
| | | * | Fix wrong error assumption when converting "0.0" to doubleJoaquim Rocha2010-11-221-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-11-2415-123/+811
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Doc: Fixing typoSergio Ahumada2010-11-221-1/+1
| * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-22109-5160/+7250
| |\ \ \ \ | | |/ / /
| * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-1946-56/+345
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-11-191-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Jan-Arve Sæther2010-11-191-4/+5
| | |\ \ \ \
| | * | | | | Fix code styleJan-Arve Sæther2010-11-191-1/+1
| * | | | | | QS60Style: Null pointer crash when using itemviews in some cases (pt2)Sami Merila2010-11-191-2/+2
| | |/ / / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-11-1926-600/+780
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' into QTBUG-15333Jan-Arve Sæther2010-11-191-2/+2
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Jan-Arve Sæther2010-11-19492-13564/+10867
| | | |\ \ \ \
| | | * | | | | Fix the tests that got affected by the behaviour added in 604c51f1fc5c79Jan-Arve Sæther2010-11-191-2/+2
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into QTBUG-15333Jan-Arve Sæther2010-11-19492-13564/+10867
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-1817-584/+560
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-11-180-0/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | Tactile Feedback plugin is not compiled in latest Sym^3 RnD envsSami Merila2010-11-183-3/+3
| | | * | | | | | | Tactile Feedback plugin is not compiled in latest Sym^3 RnD envsSami Merila2010-11-183-3/+3
| | | |/ / / / / /
| | | * | | | | | 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
| |\ \ \ \ \ \ \ \ \ \