summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-2471-225/+12302
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-241-1/+1
| |\
| | * Enable the no-undefined flag on the linker for iccOlivier Goffart2010-11-241-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-243-4/+4
| |\ \
| | * | Prevent compilers optimizing eval timebomb code out of existence.Jason McDonald2010-11-243-4/+4
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-2442-22/+11362
| |\ \ \ | | |_|/ | |/| |
| | * | Fix incorrect example for Qt.rgba()Bea Lam2010-11-241-1/+1
| | * | Flickable and MouseArea were too eager to take/keep mouse grab.Martin Jones2010-11-2415-19/+5142
| | * | Allow javascript date and regexp objects in WorkerScript messagesBea Lam2010-11-242-0/+18
| | * | Avoid lockup in ListView when animating delegates.Martin Jones2010-11-243-0/+60
| | * | Fix asynchronous reload call in test, broken by previous submitDamian Jansen2010-11-241-0/+3
| | * | Update QtGui emulator def file for bug QT-3971Joona Petrell2010-11-231-1/+2
| | * | Ignore .pc/Petri Latvala2010-11-231-0/+2
| | * | Ensure WebView press delay timer is cancelled when grab is taken.Martin Jones2010-11-2317-0/+6133
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Damian Jansen2010-11-2313-24/+529
| | |\ \
| | * | | Prevent crash when calling reload() from within a .qmlDamian Jansen2010-11-231-1/+1
| * | | | 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
| | |\ \ \ \ \ \ \