summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Expose the Flickable's internal contentItemMartin Jones2010-06-245-41/+60
* Ensure sourcesize is in pixmap cache key.Warwick Allison2010-06-241-0/+6
* doc: note that calling methods before component completion may have no effectMartin Jones2010-06-233-0/+36
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2310-74/+151
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-231-0/+1
| |\
| | * Use Pen with Qt::MiterJoin when drawing Rectangles with gradientsBea Lam2010-06-231-0/+1
| * | Fix and better test Text / TextEdit alignments.Warwick Allison2010-06-235-56/+122
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-231-0/+1
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-232-18/+11
| | |\
| * | | Ensure the view is correctly positioned at component complete.Martin Jones2010-06-232-0/+17
| | |/ | |/|
| * | References to undefined variables throws a ReferenceErrorAaron Kennedy2010-06-232-18/+11
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-231-0/+1
|\ \ \
| * | | Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.Andrew den Exter2010-06-231-0/+1
* | | | Build declarative before webkit.Alexis Menard2010-06-231-2/+2
| |_|/ |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-231-0/+1
|\ \ \ | |_|/ |/| |
| * | Fix build on Symbian^3.Aaron McCarthy2010-06-221-0/+1
* | | Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-22161-8497/+3018
|\ \ \
| * | | Fix a crash on exit. Destruction order in font database. (Symbian^4)Alessandro Portale2010-06-222-6/+18
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-223-3/+0
| |\ \ \ | | |/ / | |/| |
| | * | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-223-3/+0
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-2290-7332/+2331
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2290-7332/+2331
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2290-7332/+2331
| | | |\ \
| | | | * | Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cdSimon Hausmann2010-06-2133-322/+996
| | | | * | Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066dSimon Hausmann2010-06-217-39/+98
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2160-6986/+1252
| | | | |\ \
| | | | | * | Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-2029-5961/+0
| | | | | * | Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-194-3/+17
| | | | | * | Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aefSimon Hausmann2010-06-184-5/+13
| | | | | * | Update S60 stuff after renaming the webkit component.Alexis Menard2010-06-182-5/+5
| | | | | * | Update qmlchanges from import org.webkit to QtWebKitAlexis Menard2010-06-181-1/+1
| | | | | * | Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749aSimon Hausmann2010-06-1813-16/+265
| | | | | * | Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5Simon Hausmann2010-06-185-4/+20
| | | | | * | Remove the old WebView element in src/import. The new one is in src/3rdparty/...Alexis Menard2010-06-188-1760/+4
| | | | | * | Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5Simon Hausmann2010-06-188-10/+38
| | | | | * | Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26baSimon Hausmann2010-06-1811-4/+1672
| * | | | | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906f...Simon Hausmann2010-06-221-4/+3
| * | | | | | 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-2261-1141/+653
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Make sure ValueRecord's DeviceTables is cleaned up on failureAndreas Kling2010-06-221-2/+3
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2162-1141/+652
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | 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-2135-257/+1038
| | | |\ \ \ \
| | | | * | | | Fix for a leak in the mac style.Denis Dzyubenko2010-06-211-1/+1
| | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-06-21284-4264/+4968
| | | | |\ \ \ \
| | | | | * | | | Fix compiler warnings in QtGui (text,painting).Friedemann Kleint2010-06-213-8/+7
| | | | | * | | | Allow Unix to generate unique UUIDs if /dev/urandom exists.Darin Broady2010-06-211-23/+35
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2118-151/+177
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2118-151/+177
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | |/| |