summaryrefslogtreecommitdiffstats
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-1413-75/+221
|\
| * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-1413-75/+221
| |\
| | * 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-1312-71/+217
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-122-9/+114
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-122-9/+114
| | | | |\ | | | |/ /
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-122-9/+114
| | | | |\
| | | | | * Fix incorrect line breaking in QtWebKit.Pierre Rossi2010-06-112-9/+114
| | | * | | 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-123-12/+57
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | 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
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1010-81/+116
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | QLocalSocket: don't emit readChannelFinished() twice on WindowsJoerg Bornemann2010-06-102-1/+4
| | | | * | | QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamedJoerg Bornemann2010-06-102-6/+8
| | | | * | | QLocalSocket: fix reading from a socket after broken connectionJoerg Bornemann2010-06-102-7/+19
| | | | * | | QLocalServer: make many simultaneous connection attempts work on WindowsJoerg Bornemann2010-06-102-1/+6
| | | | * | | tst_QLocalSocket::threadedConnection autotest stabilizedJoerg Bornemann2010-06-101-26/+12
| | | | * | | tst_qlocalsocket: pro files of client / server examples fixedJoerg Bornemann2010-06-102-12/+0
| | | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-103-29/+68
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-100-0/+0
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge commit 'v4.6.3' into 4.6Thiago Macieira2010-06-090-0/+0
| | | | |\ \ \
* | | | | \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-14257-1138/+3416
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-14257-1138/+3416
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-12257-1138/+3416
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-12257-1138/+3416
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1111-0/+26
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Move listview/itemlist.qml to a separate visualitemmodel exampleBea Lam2010-06-1111-0/+26
| | | | * | | | | | | 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-1124-248/+318
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Fix test - sizeHint should not change after initial load. Also useBea Lam2010-06-111-5/+3
| | | | | * | | | | | Minor doc fixesBea Lam2010-06-117-8/+11
| | | | | * | | | | | Doc improvements, including snippet fixes, linking to examples, makingBea Lam2010-06-1118-216/+278
| | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-114-31/+127
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ 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
| | | | | * | | | | | | | Fix qmlviewer test failure on windowsMartin Jones2010-06-111-8/+8
| | | | * | | | | | | | | Make snapping work properly for highlight ranges > item sizeMartin Jones2010-06-112-28/+84
| | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-111-0/+97
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | | * | | | | | | Make snippet compile and pass license test, and add missing snippet fileBea Lam2010-06-111-0/+97
| | | | | |/ / / / / /
| | | | * | | | | | | Avoid recursive refill() in List/GridViewMartin Jones2010-06-112-20/+12
| | | | |/ / / / / /
| | | | * | | | | | Remove accidentaly added characters.Martin Jones2010-06-101-1/+1
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-10235-901/+2938
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-10235-901/+2938
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-10235-901/+2938
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Update on color change.Warwick Allison2010-06-101-0/+1
| | | | | | | * | | | | | Update on color change.Warwick Allison2010-06-101-1/+5
| | | | | | | * | | | | | Add go button to webbrowser example.Yann Bodson2010-06-105-4/+36