summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-174-7/+56
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-164-7/+56
| |\
| | * Provide 'make unsigned_sis' target for Symbian mkspecsMiikka Heikkinen2010-06-164-7/+56
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1723-134/+260
|\ \ \
| * | | doc: add note that items with width or height of 0 are not positioned.Martin Jones2010-06-171-0/+8
| * | | Add test for model data changes.Martin Jones2010-06-172-2/+47
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-17168-4302/+6414
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1619-131/+203
| | |\ \ \
| | | * | | Fix the N900 device orientation backendHarald Fernengel2010-06-162-68/+56
| | | * | | Micro cleanupHarald Fernengel2010-06-161-4/+3
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-1655-487/+642
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-161-0/+1
| | | | |\ \ \
| | | | * | | | Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-167-15/+64
| | | * | | | | Write TextInput.positionToRectangle docs.Alan Alpert2010-06-162-4/+10
| | | * | | | | Minor demo fixesAlan Alpert2010-06-162-4/+7
| | | * | | | | Fix autoScroll implementationAlan Alpert2010-06-163-36/+54
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-15662-10770/+30515
| | | |\ \ \ \ \
| | | * | | | | | Enhance docsAlan Alpert2010-06-031-0/+3
| | | * | | | | | Slight addition to the docs.Alan Alpert2010-06-011-0/+5
| * | | | | | | | clearFocus() shouldn't mess with focus if it doesn't have focusMartin Jones2010-06-171-1/+2
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1647-472/+577
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Stopping a flick resulted in the next click being consumed.Martin Jones2010-06-161-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-179-39/+99
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping setTor Arne Vestbø2010-06-161-1/+2
| * | | | | | Fixed infinite recursion when drawing very large painter paths.Kim Motoyoshi Kalland2010-06-163-9/+14
| * | | | | | Fixed full-rule on clipped painter paths.Kim Motoyoshi Kalland2010-06-161-0/+4
| * | | | | | Removed unnecessary lines of code.Kim Motoyoshi Kalland2010-06-161-4/+0
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-164-25/+79
| |\ \ \ \ \ \
| | * | | | | | Fixed problem with wrong size hints when items were removed.Jan-Arve Sæther2010-06-164-25/+79
* | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-1648-347/+970
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1631-262/+699
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1628-200/+966
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1628-200/+966
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / /
| | | * | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-165-20/+52
| | | * | | | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a886...Simon Hausmann2010-06-161-1/+1
| | | * | | | | | | Buildfix for MSVC2008 (C90 violation)Andreas Kling2010-06-151-2/+4
| | | * | | | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc846...Simon Hausmann2010-06-1523-180/+912
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-162-2/+28
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-162-2/+28
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / /
| | | * | | | | | | VideoWidget exampleKurt Korbatits2010-06-162-2/+28
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-151-0/+158
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jason McDonald2010-06-1513-117/+226
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-1519-24/+24
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-155-89/+53
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-145-89/+53
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-145-89/+53
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Fix issues with thai line breakingLars Knoll2010-06-145-89/+53
| | | | | | | * | | | | | | | Add skeleton changes files for 4.6.4.Jason McDonald2010-06-151-0/+158
| | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | Bump version number after 4.6.3 release.Jason McDonald2010-06-1519-24/+24
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-16144-4171/+6212
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |