summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix compilation after mergeOlivier Goffart2010-07-151-10/+10
* Merge remote branch 'origin/master' into qt-master-from-4.7Thiago Macieira2010-07-155-26/+268
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-155-26/+268
| |\
| | * Compile with qmlscene.Bjørn Erik Nilsen2010-07-151-1/+1
| | * Support glyphs that are wider than default width in texture glyph cacheEskil Abrahamsen Blomfeldt2010-07-151-2/+6
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-143-23/+261
| | |\ | |/ /
| | * Support RTL text in QGlyphsEskil Abrahamsen Blomfeldt2010-07-142-1/+53
| | * Support text decoration in QPainter::drawGlyphs()Eskil Abrahamsen Blomfeldt2010-07-143-22/+208
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-15705-14551/+20459
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-154-108/+22
| |\ \
| | * | fix for looping crash log on data abortShane Kearns2010-07-151-7/+20
| | * | Allow commenting of individual files in generated pkg files.axis2010-07-151-1/+1
| | * | Removed README.s60-mkspec.axis2010-07-151-99/+0
| | * | Fixed install docs for Qt for Symbian on Linux.axis2010-07-151-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-153-0/+23
| |\ \ \ | | |/ / | |/| |
| | * | Performance docs.Michael Brasser2010-07-151-0/+21
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-142-0/+2
| | |\ \ | |/ / /
| | * | Added symbian defs for e55781212532e2abcdd1cef8548b146fb14f0713Lasse Holmstedt2010-07-142-0/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-144-4/+53
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-134-4/+53
| | |\ \ \
| | | * | | Fixes QGraphicsItem::focusItem() returning incorrect value.Yoann Lopes2010-07-132-2/+31
| | | * | | Fixes crash in QGraphicsScene::addItem().Yoann Lopes2010-07-132-2/+22
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1435-427/+711
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-149-10/+174
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-146-3/+144
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-1421-417/+522
| | | | |\ \ \
| | | | * | | | Position GridView and ListView footer correctly when model cleared.Martin Jones2010-07-146-3/+144
| | | * | | | | Clean up particle motion documentationAlan Alpert2010-07-141-3/+16
| | | * | | | | Finish QML for Qt Programmers sectionAlan Alpert2010-07-141-2/+10
| | | * | | | | Distinguish Qt Quick, Qt Declarative and QML on the landing pageAlan Alpert2010-07-141-2/+4
| | | | |/ / / | | | |/| | |
| | * | | | | Check for binding having been deleted in more placesAaron Kennedy2010-07-141-0/+6
| | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-1424-123/+154
| | |\ \ \ \
| | | * | | | improvements to docs and examplesBea Lam2010-07-1413-82/+115
| | | * | | | Fix test for get() to check for undefined return valuesBea Lam2010-07-141-4/+6
| | | |/ / /
| | | * | | Enter key performs same action as Return key in QML demos.Martin Jones2010-07-145-0/+9
| | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-131-18/+12
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'networkHangFixes' into 4.7-s60axis2010-07-131-18/+12
| | |\ \ \ | |/ / / /
| | * | | Revert "Making network reconnect happen after teardown."axis2010-07-131-6/+2
| | * | | Revert "Adding some error checking for setdefaultif"axis2010-07-131-3/+1
| | * | | Fixed a possible hanging bug in the Symbian networking.axis2010-07-131-1/+2
| | * | | Fixed a network hanging bug on Symbian.axis2010-07-131-9/+8
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-131-1/+6
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-134-18/+10
| | |\ \ \ \
| | * | | | | Ensure the section header isn't shown twice.Martin Jones2010-07-131-1/+6
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-133-18/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Only support portrait and landscape orientations on Symbian when updating the...Joona Petrell2010-07-133-18/+6
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-131-0/+4
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1311-36/+119
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | | | * | Split responsibilities in QDeclarativeExpression more cleanlyAaron Kennedy2010-07-147-331/+401
| | | | |/ / | | | |/| |
| | | * | | Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
| | |/ / /