summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-1485-400/+1398
|\
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-136-3/+76
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-135-3/+66
| | |\
| | | * Ensure ListView contentHeight is set to a valid size.Martin Jones2010-12-133-0/+63
| | | * Revert "Add mirroring-positioners.qml example" that was accidentally pushedJoona Petrell2010-12-131-70/+0
| | | * Fix dragging Flickable back over start point.Martin Jones2010-12-131-2/+2
| | | * Add mirroring-positioners.qml exampleJoona Petrell2010-12-131-0/+70
| | | * A QAIM model resulted in items moving to incorrect locationsMartin Jones2010-12-131-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-131-0/+10
| | |\ \
| | | * | Add expected failures for JS test suite on SymbianKent Hansen2010-12-131-0/+10
| | |/ /
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Olivier Goffart2010-12-133-3/+64
| |\ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-1381-397/+1322
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1337-145/+683
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Build on SymbianMartin Jones2010-12-121-13/+13
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1137-138/+676
| | | |\ \ | | |/ / /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1037-138/+676
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1037-138/+676
| | | | |\ \
| | | | | * | QmlViewer: Remove trailing whitespaceKai Koehne2010-12-104-7/+7
| | | | | * | QmlViewer: Remove trailing whitespaceKai Koehne2010-12-106-18/+18
| | | | | * | QmlViewer: Fix crash on exitKai Koehne2010-12-101-21/+21
| | | | | * | PathView: removing the currentIndex could make it invalid.Martin Jones2010-12-102-1/+5
| | | | | * | Fix broken database creation caused by previous fixBea Lam2010-12-101-8/+17
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1027-88/+613
| | | | | |\ \
| | | | | | * | Improvements to anchoring docsBea Lam2010-12-092-17/+51
| | | | | | * | QDeclarativeProperty doc improvementsBea Lam2010-12-091-3/+16
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0925-68/+546
| | | | | | |\ \
| | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0925-68/+546
| | | | | | | |\ \
| | | | | | | | * | Update QtGui bwins def file for QTBUG-15615Joona Petrell2010-12-091-2/+4
| | | | | | | | * | Merge qtsoftware:qt/qt.git#4.7 into qtsoftware:qt/qt-qml.git#4.7Joona Petrell2010-12-0921-77/+308
| | | | | | | | |\ \
| | | | | | | | * | | highlightFollowsCurrentItem: false was not always honoredMartin Jones2010-12-096-20/+44
| | | | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0821-46/+498
| | | | | | | | |\ \ \
| | | | | | | | | * | | ListView: Fix calculation of currentItem position when out of view.Martin Jones2010-12-083-5/+102
| | | | | | | | | * | | Update QtGui def filesJoona Petrell2010-12-072-0/+2
| | | | | | | | | * | | Fix openDatabaseSync() to not create unused directoryBea Lam2010-12-071-1/+0
| | | | | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0615-40/+394
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0615-40/+394
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * | | Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-064-1/+156
| | | | | | | | | | | * | | Some doc clarification for components and javascript integrationBea Lam2010-12-062-15/+18
| | | | | | | | | | | * | | Cursor shouldn't blink while dragging cursor positionChristopher Ham2010-12-063-0/+11
| | | | | | | | | | | * | | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-066-22/+207
| | | | | | | | | | | * | | Doc: make it clear that "z" affects sibling stacking order.Martin Jones2010-12-051-2/+2
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-111-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-101-0/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | refuse to open empty translation filesOswald Buddenhagen2010-12-101-0/+7
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-101-5/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fix qwidget test crashMiikka Heikkinen2010-12-101-5/+27
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-101-5/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Missing glyphs in GL when scaling QStaticText and QML text itemsEskil Abrahamsen Blomfeldt2010-12-101-5/+13
| | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-104-8/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | / / / / / / / / / | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | fix path separator matchingOswald Buddenhagen2010-12-101-2/+2