summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-078-118/+148
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-078-118/+148
| |\
| | * Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-10-073-7/+25
| | * Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-10-075-9/+61
| | * Make default application deployment removableMiikka Heikkinen2010-10-076-102/+62
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-0785-1383/+3990
|\ \ \ | |/ / |/| |
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-072-25/+43
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-072-25/+43
| | |\ \
| | | * | Minor OpenVG optimization when setting the EGL surface attribute.Jason Barron2010-10-071-3/+2
| | | * | Make sure the QS60PaintEngine can draw other classes of pixmap dataJason Barron2010-10-071-22/+41
| * | | | Merge faba550d704312a29d9485bcaaa506331f102301 from 4.7 to master.Olivier Goffart2010-10-071-1/+1
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-0782-1357/+3946
| |\ \ \ \ |/ / / / / | | _ / / | | / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0755-1031/+2917
| |\ \ \
| | * | | Fix failure on Windows after commit ccd3f66Bradley T. Hughes2010-10-071-0/+8
| | * | | tst_qtcpserver: Another attempt to reproduce QTBUG-14268Markus Goetz2010-10-062-7/+61
| | * | | Fix crash when constructing QThreadStorage after global destructors have runBradley T. Hughes2010-10-066-6/+104
| | * | | tst_qtcpsocket: Attempt to reproduce QTBUG-14268Markus Goetz2010-10-061-0/+71
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0647-1025/+2680
| | |\ \ \
| | | * | | Fixed a buffer overrun when pasting large data from non-Qt appsDenis Dzyubenko2010-10-064-16/+12
| | | * | | Fix copying large data to non-Qt applicationsDenis Dzyubenko2010-10-061-1/+1
| | | * | | fix regexp in "make custom command handling in vc(x)proj files sane"Oswald Buddenhagen2010-10-061-1/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0543-1008/+2667
| | | |\ \ \
| | | | * | | qmake: Include -pthread when reducing duplicate library argumentsTor Arne Vestbø2010-10-051-1/+1
| | | | * | | qmake: Ensure right library order when reducing duplicate librariesTor Arne Vestbø2010-10-051-4/+6
| | | | * | | rebuild configure.exeOswald Buddenhagen2010-10-051-0/+0
| | | | * | | make QMAKE_POST_LINK handling in nmake generator saneOswald Buddenhagen2010-10-051-4/+1
| | | | * | | make custom command handling in vc(x)proj files saneOswald Buddenhagen2010-10-057-89/+50
| | | | * | | Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Marius Storm-Olsen2010-10-052-19/+6
| | | | * | | QtScript/JavaScriptCore: Backport random number generator seeding fixKent Hansen2010-10-057-6/+41
| | | | * | | Fix performance regression in QUuid::createUuid()Bradley T. Hughes2010-10-055-26/+118
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0423-884/+2469
| | | | |\ \ \
| | | | | * | | Update japanese translations.axasia2010-10-046-661/+1952
| | | | | * | | Ensure that the underline is only drawn when expected for an accelAndy Shaw2010-10-042-4/+57
| | | | | * | | Small improvement in the textedit demoDenis Dzyubenko2010-10-041-2/+2
| | | | | * | | My changes for 4.7.1Miikka Heikkinen2010-10-041-1/+43
| | | | | * | | Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-045-188/+352
| | | | | |\ \ \
| | | | | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-011164-2053/+9426
| | | | | | |\ \ \
| | | | | | * | | | Doc: Fixing link titles and error color in search resultsMorten Engvoldsen2010-10-011-2/+8
| | | | | | * | | | Doc: Implementing features to the search feature.Morten Engvoldsen2010-10-013-2/+6
| | | | | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-3070-141/+170911
| | | | | | |\ \ \ \
| | | | | | * | | | | Doc: Implementing new doc search dialog.Morten Engvoldsen2010-09-293-88/+152
| | | | | | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2845-4601/+679
| | | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-4/+3
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Doc: fixing slim fit style - search box.Morten Engvoldsen2010-09-281-4/+3
| | | | | | * | | | | | | Doc: add style to new search resultsMorten Engvoldsen2010-09-281-1/+79
| | | | | | * | | | | | | Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-28129-668/+2199
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / /
| | | | | | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-0/+39
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-28125-634/+2144
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | | | | | | * | | | | | | | Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-282-34/+3
| | | | | | | | |/ / / / / / | | | | | | | |/| | | | | |