summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-082-1/+87
|\
| * Scroll TextInput to ensure preedit text is visible.Andrew den Exter2011-02-082-1/+87
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-0722-19/+403
|\ \ | |/
| * Changing header/footer size during creation caused recusionMartin Jones2011-02-072-4/+8
| * Ensure section delegates are updated when the section property changes.Martin Jones2011-02-073-0/+119
| * Make test compileBea Lam2011-02-071-2/+2
| * Disable lineHeight test while implementing the feature in master properly.Yann Bodson2011-02-071-3/+3
| * Initialize primitives when creating a new QVariantAaron Kennedy2011-02-041-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2011-02-0413-5/+154
| |\
| | * modelChanged() should not be emitted until view is repopulatedBea Lam2011-02-043-1/+60
| | * AnimatedImage does not notify on status change.Yann Bodson2011-02-044-3/+61
| | * Clarify case preservation in QDeclarativeImageProvidersAlan Alpert2011-02-042-1/+11
| * | Allow unknown types to be passed opaquely through signalsAaron Kennedy2011-02-037-6/+140
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-0413-58/+423
|\ \ \
| * | | Move the QtHelp tests in its own profileOlivier Goffart2011-02-043-10/+9
| * | | Namespace compilation - OCI typedefs should be outside Qt namespace.Michael Goddard2011-02-041-3/+3
| * | | Fix some removeRows issues with QSqlTableModel.Michael Goddard2011-02-042-24/+158
| * | | Mention the requirement for OCI when building the SQL oracle driver.Michael Goddard2011-02-041-1/+3
| * | | Try to document that invalid database arguments use the default database.Michael Goddard2011-02-042-2/+4
| * | | Update some documentation about what happens with select()/setQuery().Michael Goddard2011-02-042-0/+4
| * | | Make sure that setRecord emits dataChanged() with OnManualSubmit.Michael Goddard2011-02-042-2/+10
| * | | QSqlTableModel/QSqlQueryModel and insertColumns problem.Michael Goddard2011-02-045-14/+223
| * | | tst_qsvgrenderer: works on shadowbuildOlivier Goffart2011-02-032-2/+9
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-04256-16208/+10705
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7David Boddie2011-02-035-11/+24
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-02252-16195/+10692
| | |\ \ \ \
| * | \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-02-039-19/+19
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-02-028-18/+18
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-022-2/+2
| | | |\ \ \ \ \
| | | * | | | | | Doc: Fixed a reference to the wrong image.David Boddie2011-02-021-2/+2
| | | * | | | | | Fixed a bug that caused marked up inline text to be truncated.David Boddie2011-02-021-1/+1
| | | * | | | | | Doc: Renamed an image to ensure that it does not clash with another.David Boddie2011-02-021-0/+0
| | | * | | | | | Doc: Fixed QML, unindented snippet.David Boddie2011-02-011-5/+5
| | | * | | | | | Doc: Removed unnecessary HTML entity from the title.David Boddie2011-02-011-6/+6
| | | * | | | | | Doc: Fixed broken links to the old Symbian Foundation Wiki.David Boddie2011-02-011-2/+2
| | | * | | | | | Doc: Updated the copyright statements in the templates.David Boddie2011-02-012-2/+2
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-01-311-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Doc: Fixing typoSergio Ahumada2011-01-311-1/+1
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-01-31252-16195/+10692
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-01-29235-7209/+9766
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Sergio Ahumada2011-01-281-1/+1
| | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-2813-23/+73
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2011-01-289-19/+66
| | | | |\ \ \ \ \
| | | | * | | | | | Doc: including missing pages in overviews.Morten Engvoldsen2011-01-283-0/+3
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-01-27220-7174/+9682
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Doc: Fixed typo in QCoreApplication docsGeir Vattekar2011-01-271-4/+4
| | | * | | | | | | | Doc: Adjusted the font sizes for the offline documentation.David Boddie2011-01-281-11/+10
| | | * | | | | | | | Doc: Added a missing style sheet to the qhp manifest.David Boddie2011-01-281-1/+1
| | | * | | | | | | | Doc: Fixed the qthelp namespace for the Qt documentation.David Boddie2011-01-281-1/+1
| | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Fixed whitespace.David Boddie2011-01-271-9/+9