summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/master'Jason McDonald2010-11-26260-5583/+20779
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-255-1/+11
| |\
| | * Fix some memory leaks.Fabien Freling2010-11-255-1/+11
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-256-4/+95
| |\ \
| | * | fix performance penalty in Win32MakefileGenerator::findHighestVersionJoerg Bornemann2010-11-251-2/+8
| | * | Allow QDial to wrap value when wrapping property is set.Andy Nichols2010-11-253-1/+80
| | * | QtScript variant conversion: Convert numbers to (u)int if applicable (reviewe...Thomas Senyk2010-11-252-1/+7
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-25292-6035/+21775
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-252-0/+8
| | |\ \
| | | * \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-252-0/+8
| | | |\ \
| | | | * \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-252-0/+8
| | | | |\ \
| | | | | * \ 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 remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-25290-6035/+21767
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-251-1/+1
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | fix inf loop bughawcroft2010-11-251-1/+1
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-2485-627/+1480
| | | |\ \ \ \ \
| | | | * | | | | Fixed tst_qwidget::winIdChangeEventGareth Stockwell2010-11-241-12/+17
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-2484-615/+1463
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | | * | | | Use parent class function to generate Makefile headers in SymbianMiikka Heikkinen2010-11-232-20/+3
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-231-1/+1
| | | | | |\ \ \ \
| | | | | | * | | | Fix QPixmap::fromImage() in the OpenVG pixmap backend.Jason Barron2010-11-231-1/+1
| | | | | * | | | | Fix spacesJanne Koskinen2010-11-232-2/+2
| | | | | |/ / / /
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-232-17/+35
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-231-0/+3
| | | | | | |\ \ \ \
| | | | | | * \ \ \ \ Merge branch '4.7-s60' into 4.7-s60axis2010-11-230-0/+0
| | | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ \ Merge branch '4.7' into 4.7-s60axis2010-11-23121-5184/+7779
| | | | | | |\ \ \ \ \ \
| | | | | * | | | | | | | Native color dialog on symbianMilla Pohjanheimo2010-11-233-6/+131
| | | | | | |_|_|/ / / / | | | | | |/| | | | | |
| | | | | * | | | | | | Fix non-stroked filled paths in OpenVG paint engine.Jason Barron2010-11-231-0/+3
| | | | | | |_|/ / / / | | | | | |/| | | | |
| | | | | * | | | | | Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-23123-5219/+7796
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| / / / / | | | | | | |/ / / /
| | | | | * | | | | Fix symbian-mmp.conf include pathMiikka Heikkinen2010-11-222-3/+3
| | | | | * | | | | Fix a build break when namespace is definedMiikka Heikkinen2010-11-221-17/+17
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-1978-591/+1328
| | | | | |\ \ \ \ \
| | | * | | \ \ \ \ \ 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
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |