summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-253-13/+13
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-25126-1003/+2352
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-253-13/+13
| |\ \
| | * | Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-253-13/+13
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-25223-3435/+2519
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-25240-1975/+4127
|\ \ \ \ | | |_|/ | |/| |
| * | | Optimize QML "parent" property accessAaron Kennedy2010-03-254-16/+91
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alexis Menard2010-03-250-0/+0
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2518-540/+859
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2555-291/+551
| | | |\ \ \
| | | * | | | Begin dragging PathView up to the level (quality and functionality) of other ...Martin Jones2010-03-256-309/+411
| | * | | | | Rename qdeclarativetime -> qmltimeAaron Kennedy2010-03-2521-39/+39
| | | |_|_|/ | | |/| | |
| * | | | | Begin dragging PathView up to the level (quality and functionality) of other ...Martin Jones2010-03-256-309/+411
| * | | | | Rename qdeclarativetime -> qmltimeAaron Kennedy2010-03-2521-39/+39
| * | | | | Auto-test fix.Alexis Menard2010-03-252-10/+4
| * | | | | Build Fix and port to new width and height propertiesAlexis Menard2010-03-255-8/+8
| * | | | | Port Flickable and Flipable to support QGraphicsObject.Alexis Menard2010-03-254-20/+21
| * | | | | Protect the QDeclarativeListProperty used in QGraphicsItem with ifdefAlexis Menard2010-03-251-0/+4
| * | | | | Fix the build due to new properties in QGraphicsObject.Alexis Menard2010-03-252-6/+5
| * | | | | Remove the children property from QDeclarativeItem.Alexis Menard2010-03-253-113/+93
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-2569-251/+1228
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-251-2/+2
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | | | | |\ \ \ \
| | | | | | * | | | Calculate period size correctly.Justin McPherson2010-03-241-2/+2
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-259-3/+365
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-249-3/+365
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Stabilize QGraphicsEffect test on X11Olivier Goffart2010-03-241-1/+2
| | | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-249-3/+364
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Add a children private property needed for QML to support QGraphicsObjectAlexis Menard2010-03-247-0/+279
| | | | | * | | | | | | Invalidate the cache of QGraphicsEffect if a child becomes visible.Alexis Menard2010-03-242-1/+48
| | | | | * | | | | | | Fix a crash when reparenting an item in QGraphicsView.Alexis Menard2010-03-242-2/+37
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-246-80/+302
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Fix error reporting when symbian file copy fails.Shane Kearns2010-03-242-2/+42
| | | * | | | | | | | | QIODevice::read() and QFile::atEnd() performance improvementsmread2010-03-244-78/+260
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-246-5/+32
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-246-5/+32
| | | |/ / / / / / /
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-2424-120/+225
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Clarified pkg_prerules usage documentation.Miikka Heikkinen2010-03-243-8/+21
| | | * | | | | | | Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-245-18/+46
| | | * | | | | | | Symbian QAudioOutput::suspend() was resetting processedUSecs() to zeroGareth Stockwell2010-03-241-1/+2
| | | * | | | | | | Merge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6Gareth Stockwell2010-03-2447-341/+689
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-2415-93/+155
| | | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | | | * | | | | | Compile fixAlessandro Portale2010-03-231-2/+2
| | | | | * | | | | | Changed Symbian pkg files to deploy from under epoc32Miikka Heikkinen2010-03-232-4/+22
| | | | | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-03-2345-296/+656
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01Janne Anttila2010-03-231-3/+3
| | | | | | * | | | | | Fixed S60 softkey implementation to use popup/modal dialog softkeys.Janne Anttila2010-03-235-16/+61
| | | | | | * | | | | | Fixed 'fullsreen with softkeys' mode not to expand under softkey area.Janne Anttila2010-03-233-25/+29