summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-222-4/+7
|\
| * Prohibit some property names to be used for dynamic propertiesJarek Kobus2010-06-221-0/+4
| * Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906f...Simon Hausmann2010-06-221-4/+3
* | doc: Added more DITA output to the XML generatorMartin Smith2010-06-223-8/+71
|/
* doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-1/+45
* Finish merge conflict.Martin Smith2010-06-22733-15155/+8433
|\
| * qdoc3: Build fix for regression in f321a3f2b1eAndreas Kling2010-06-222-4/+4
| * Clean up HB_Anchor's DeviceTables on failure when loading format 3Andreas Kling2010-06-221-1/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-221456-37965/+30385
| |\
| | * Make sure ValueRecord's DeviceTables is cleaned up on failureAndreas Kling2010-06-221-2/+3
| | * qdoc3: Build fix for regression in e2f0e728eAndreas Kling2010-06-223-6/+5
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-211457-37966/+30386
| | |\
| | | * Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanupAndreas Kling2010-06-211-1/+1
| | | * Fix null HB_Device** dereference on exit in Harfbuzz GPOS codeAndreas Kling2010-06-213-16/+20
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-2164-341/+1420
| | | |\
| | | * | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-21578-14522/+7428
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-225-10/+11
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-215-10/+11
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Compiler warnings (unused variables).Bjørn Erik Nilsen2010-06-211-3/+0
| | | * | | Compiler warnings.Bjørn Erik Nilsen2010-06-212-3/+3
| | | * | | Fix crash with large ClientCutMessagePaul Olav Tvete2010-06-211-1/+1
| | | * | | Fix crash at exit and out of bounds writePaul Olav Tvete2010-06-211-2/+2
| | | * | | fix issue wrt posted events on Windows CEJoerg Bornemann2010-06-211-1/+5
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2296-426/+528
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add screenshots for most examples and demosBea Lam2010-06-2250-33/+283
| | * | | | Rename example: edit -> textselectionBea Lam2010-06-226-0/+16
| | * | | | Clean up some examplesBea Lam2010-06-2237-374/+195
| | * | | | Rename example and add minor improvementsBea Lam2010-06-221-17/+32
| | * | | | Rename example image fileBea Lam2010-06-222-1/+1
| | * | | | Spelling fixBea Lam2010-06-221-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2117-18/+79
| |\ \ \ \ \
| | * | | | | Update 4.7-beta2 def filesShane Kearns2010-06-216-6/+39
| | * | | | | Added Samsung and Sony-Ericsson manufacturer IDs to sqlite3.sisMiikka Heikkinen2010-06-211-0/+0
| | * | | | | Fix for TLS problem which causes apps to crash in the S60 portmread2010-06-211-1/+28
| | * | | | | Fixed bearer plugin deployment in libinfixed buildsMiikka Heikkinen2010-06-181-3/+3
| | * | | | | Always add QtNetwork include path when linking with QtWebkit in SymbianMiikka Heikkinen2010-06-181-1/+2
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-187-7/+7
| | |\ \ \ \ \
| | | * | | | | Assigning 0xA UID3s to the new standalone qml demosAlessandro Portale2010-06-177-7/+7
| * | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-2112-43/+73
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-2010-41/+66
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1817-101/+365
| | | |\ \ \ \ \ \
| | | | * | | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f5...Simon Hausmann2010-06-182-17/+31
| | | | * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-183-1/+15
| | | | * | | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a25...Simon Hausmann2010-06-183-55/+57
| | | | * | | | | | Re-enable data structure packing in Harfbuzz for RVCTSimon Hausmann2010-06-183-15/+15
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-1812-14/+248
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-1812-14/+248
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-181-0/+3
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Fixed device context leak in QGLWidget on Windows.Kim Motoyoshi Kalland2010-06-181-0/+3
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-181-0/+3
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |