summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update lupdate to recognize concatenated text in QML files.Michael Brasser2010-06-241-16/+56
* Ensure sourcesize is in pixmap cache key.Warwick Allison2010-06-241-0/+6
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-243-0/+36
|\
| * doc: note that calling methods before component completion may have no effectMartin Jones2010-06-233-0/+36
* | Use ugly but reliable bitmaps fonts in test.Warwick Allison2010-06-2420-0/+2
|/
* Fix unstable qdeclarativeviewer testsBea Lam2010-06-231-2/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2342-138/+427
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-232-0/+1
| |\
| | * Use Pen with Qt::MiterJoin when drawing Rectangles with gradientsBea Lam2010-06-231-0/+1
| | * Update screenshotBea Lam2010-06-231-0/+0
| * | Fix and better test Text / TextEdit alignments.Warwick Allison2010-06-2327-56/+326
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-232-12/+5
| |\
| | * Support for non-literal plural arguments to qsTr() in lupdate (QML).Michael Brasser2010-06-231-12/+4
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-236-25/+31
| | |\
| * | | Ensure the view is correctly positioned at component complete.Martin Jones2010-06-236-45/+65
| | |/ | |/|
| * | References to undefined variables throws a ReferenceErrorAaron Kennedy2010-06-236-25/+31
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-232-0/+129
|\ \ \
| * | | Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.Andrew den Exter2010-06-232-0/+129
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-231-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2217-104/+132
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-221573-45368/+32945
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-222-6/+18
|\ \ \ \
| * | | | 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-228-9/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-228-9/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-221457-37974/+30543
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-2299-7343/+2341
| |\ \ \
| * \ \ \ 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
| * | | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-3/+41
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-219-54/+137
| |\ \ \ \ \ \ \
| | * | | | | | | Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.Friedemann Kleint2010-06-211-1/+16
| | * | | | | | | Fix for a leak in the mac style.Denis Dzyubenko2010-06-211-1/+1