summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-0919-82/+95
|\
| * Minimal fix to get the svgalib example to compilePaul Olav Tvete2010-03-095-34/+34
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-091061-22112/+41839
| |\
| | * Renamed QPainter::Fragment/Hint -> QPainter::PixmapFragment/HintTrond Kjernåsen2010-03-0911-45/+50
| | * QTreeView: let the dataChanged signal refresh the hasChildren attribute.Olivier Goffart2010-03-091-1/+5
| * | Fix alignment of text with negative right bearingEskil Abrahamsen Blomfeldt2010-03-093-2/+6
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-0918-251/+1326
|\ \ \ | | |/ | |/|
| * | Add license headerOlivier Goffart2010-03-091-0/+41
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-0918-251/+1285
| |\ \ |/ / /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-0818-251/+1285
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-0818-251/+1285
| | |\ \
| | | * | Fixed bounds calculation in QtSvg.Kim Motoyoshi Kalland2010-03-0811-226/+204
| | | * | Fixed vector-effect property output from QSvgGenerator.Kim Motoyoshi Kalland2010-03-083-24/+19
| | | * | Added text benchmarks from qtbench to tests/benchmarksSamuel Rødal2010-03-084-1/+1062
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0913-71/+561
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-098-48/+535
| |\ \ \ \
| | * | | | Minor cleanup.Michael Brasser2010-03-092-26/+15
| | * | | | Add highlightRangeMode and snapMode to GridView.Martin Jones2010-03-094-20/+488
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-0925-507/+257
| | |\ \ \ \
| | * | | | | Minor anchors.fill optimization.Michael Brasser2010-03-094-2/+32
| * | | | | | Move pixmapChanged signal to QDeclarativeImageYann Bodson2010-03-094-8/+7
| | |/ / / / | |/| | | |
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0844-546/+341
| |\ \ \ \ \
| * | | | | | Use one thread for all instances.Bea Lam2010-03-081-15/+19
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-084-7/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Always copy the qmldir files into the build directoryTobias Hunger2010-03-084-7/+7
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-081-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix failing autotest.Alan Alpert2010-03-081-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-085-8/+11
|\ \ \ \ \
| * | | | | fix to mainwindow demoThierry Bastian2010-03-081-1/+1
| * | | | | Fix build on Maemo X11Tom Cooksey2010-03-081-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-08541-12494/+26215
| |\ \ \ \ \
| | * | | | | Enable cleanup hooks when creating an EGL surface for a pixmapTom Cooksey2010-03-082-6/+7
| * | | | | | Fix crash on Win with 16bit screendepth when copy/pasting imagesaavit2010-03-081-0/+2
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-0810-467/+200
|\ \ \ \ \ \ \
| * | | | | | | Remove duration property from QSoundEffect.Justin McPherson2010-03-088-44/+0
| * | | | | | | Fix effects.pri.Justin McPherson2010-03-081-2/+2
| * | | | | | | Refactor QSoundEffect.Justin McPherson2010-03-089-440/+217
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-08155-3074/+4257
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | clearFocus() before setParentItem(0) on an item with focus.Martin Jones2010-03-082-3/+9
| * | | | | | | Remove expect fail from ListView currentIndex testMartin Jones2010-03-081-3/+7
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-082-0/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Make the animation property of Behavior deferred.Michael Brasser2010-03-082-0/+2
| * | | | | | | fix QDeclarativeItem sceneEvent handlingYann Bodson2010-03-081-3/+3
| |/ / / / / /
| * | | | | | Particles optimization and doc fixes.Michael Brasser2010-03-081-3/+5
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0836-109/+171
| |\ \ \ \ \ \
| | * | | | | | Fix Qt.tint() algorithmAaron Kennedy2010-03-083-13/+9
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-0823-96/+125
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Remove expected warningBea Lam2010-03-082-19/+2
| | | * | | | | Use a better method for installing declarative demos.Rohan McGovern2010-03-087-76/+16
| | | * | | | | Fixed declarative examples not being installed.Rohan McGovern2010-03-0814-1/+107