summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-1512-35/+109
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-154-7/+18
| |\
| | * Fixed unit test failure in qimagereader.Kurt Korbatits2010-06-151-1/+1
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-142-2/+1
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-142-2/+1
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | | |\
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | | | |\
| | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-122-2/+1
| | | | | | |\
| | | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-102-2/+1
| | | | | | | |\
| | | | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-06-1060-680/+852
| | | | | | | | |\
| | | | | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-101-1/+1
| | | | | | | | | |\
| | | | | | | | * | | Regression Qt4.4: QMovie does not render properly some mng filesKurt Korbatits2010-06-101-1/+0
| | | | | | | | | |/ | | | | | | | | |/|
| | | | | | | | * | QMovie cpu usage up to 100%Kurt Korbatits2010-06-101-1/+1
| | * | | | | | | | QLocalSocket/Win: check for broken pipe in waitForReadyReadJoerg Bornemann2010-06-141-0/+11
| | * | | | | | | | QLocalSocket/Win: call close on async connection lossJoerg Bornemann2010-06-141-0/+2
| | |/ / / / / / /
| | * | | | | | | fix detection of header filesDavid Fries2010-06-141-4/+3
| | |/ / / / / /
| * | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-149-28/+91
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-149-28/+91
| | |\ \ \ \ \ \ \
| | | * | | | | | | Prospective S60 build fixSimon Hausmann2010-06-132-4/+4
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-138-24/+87
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-121-3/+9
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-121-3/+9
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | | | * | | | Fix incorrect line breaking in QtWebKit.Pierre Rossi2010-06-111-3/+9
| | | | | | |/ / /
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-125-5/+5
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-115-5/+5
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | | * | | Allow to build Qt in static with mingwThierry Bastian2010-06-115-5/+5
| | | | | | | |/ | | | | | | |/|
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-113-12/+57
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Thread safety for QFontEngineS60Shane Kearns2010-06-113-12/+57
| | | | * | | | QLocalSocket: don't emit readChannelFinished() twice on WindowsJoerg Bornemann2010-06-101-0/+3
| | | | * | | | QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamedJoerg Bornemann2010-06-102-6/+8
| | | | * | | | QLocalSocket: fix reading from a socket after broken connectionJoerg Bornemann2010-06-101-4/+6
| | | | * | | | QLocalServer: make many simultaneous connection attempts work on WindowsJoerg Bornemann2010-06-102-1/+6
| | | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-103-29/+68
| | | | | |/ / | | | | |/| |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-155-9/+17
|\ \ \ \ \ \ \
| * | | | | | | Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbfSimon Hausmann2010-06-155-9/+17
| |/ / / / / /
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-157-28/+74
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-147-28/+74
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fixed error reporting in grayraster and reduced default pool size.Carolina Gomes2010-06-144-22/+35
| | * | | | | Add QTextOption API to QStaticTextEskil Abrahamsen Blomfeldt2010-06-143-6/+39
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1461-612/+991
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1261-612/+991
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1261-612/+991
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-111-0/+2
| | | |\ \ \ \
| | | | * | | | Move listview/itemlist.qml to a separate visualitemmodel exampleBea Lam2010-06-111-0/+2
| | | * | | | | ListView.onRemove animation is not played when the list has only one item.Martin Jones2010-06-112-2/+2
| | | |/ / / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1118-133/+229
| | | |\ \ \ \
| | | | * | | | Minor doc fixesBea Lam2010-06-117-8/+11
| | | | * | | | Doc improvements, including snippet fixes, linking to examples, makingBea Lam2010-06-1113-114/+200
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-112-20/+12
| | | | |\ \ \ \
| | | | * | | | | Do not keep flush timer running once no pixmaps are detached.Warwick Allison2010-06-111-11/+18