summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Doc: Update to Phonon overviewGeir Vattekar2010-10-081-19/+0
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-10-064-5/+11
|\
| * Added a project file for the Getting Started with QML and changed theJerome Pasion2010-10-063-2/+6
| * Clarified the auto connect enumeration regarding which type ofJerome Pasion2010-10-061-3/+5
* | Doc: Fixed doc references to non-existing APIGeir Vattekar2010-10-061-3/+2
* | Doc: Fix broken links in QSslConfigurationGeir Vattekar2010-10-061-3/+4
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-062-2/+2
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-061845-6418/+14930
| |\
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-0648-353/+789
| | |\
| | * | Doc: Fixing bug in QML tutorialMorten Engvoldsen2010-10-061-1/+1
| * | | Doc: Fixing spacing bug in columnsMorten Engvoldsen2010-10-061-1/+1
* | | | Added installation section and fixed some whitespace.Jerome Pasion2010-10-061-36/+46
* | | | Merge branch '13092010doc' into 4.7Jerome Pasion2010-10-061-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch '13092010doc' of scm.dev.nokia.troll.no:qt/qt-doc-team into 1309...Jerome Pasion2010-09-16387-6615/+15965
| |\ \ \
| | * | | Doc: Cleaning up the known issues page. Pointing people to check the online r...Morten Engvoldsen2010-09-161-120/+5
| | * | | Merge branch '4.7' into 13092010docMorten Engvoldsen2010-09-16386-6495/+15960
| | |\ \ \
| * | | | | Added statement regarding validators and input masks on the same line edit.Jerome Pasion2010-09-141-1/+4
| |/ / / /
| * | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-132-5/+53
* | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0548-353/+789
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0548-353/+789
| |\ \ \ \
| | * | | | Document and test paintedWidth and paintedHeight properties of ImageYann Bodson2010-10-052-0/+50
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0546-353/+739
| | |\ \ \ \ | |/ / / / /
| | * | | | Add missing license header.Michael Brasser2010-10-041-0/+41
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0446-353/+698
| | |\ \ \ \
| | | * | | | Improve test coverage for declarative module.Michael Brasser2010-10-049-4/+76
| | | * | | | Avoid potential null dereference.Martin Jones2010-10-042-2/+2
| | | * | | | Add autotest for reserved words in QML.Michael Brasser2010-10-041-0/+76
| | | * | | | Prevent crash in XmlListModel when appending an empty role.Michael Brasser2010-10-043-1/+19
| | | * | | | Remove unused, unexported class.Michael Brasser2010-10-043-260/+0
| | | * | | | Fix clipping behavior for non-cached text.Michael Brasser2010-10-042-2/+1
| | | * | | | CompileAaron Kennedy2010-10-042-0/+55
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0128-85/+470
| | | |\ \ \ \
| | | | * | | | Only cache textlayout in paint engines that support transformationsAaron Kennedy2010-10-011-1/+6
| | | | * | | | QmlDebugService: Fix compiler warning about cast from asciiKai Koehne2010-10-011-2/+2
| | | | * | | | Qt.openUrlExternally should resolve relative URLs.Michael Brasser2010-10-015-9/+58
| | | | * | | | Doc: add missing image.Yann Bodson2010-10-012-7/+7
| | | | * | | | Doc: typographical and spelling errors.Yann Bodson2010-10-0114-28/+28
| | | | * | | | Doc: remove unfinished and confusing mention to focus panels.Yann Bodson2010-10-011-10/+0
| | | | * | | | Apply the QStaticText text-caching strategy for QMLAaron Kennedy2010-10-016-28/+369
| | | | * | | | Documentation: input to Qt.rgba should be from 0-1, not 0-255.Michael Brasser2010-10-011-1/+1
* | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0455-929/+680
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-044-27/+40
| |\ \ \ \ \ \ \
| | * | | | | | | Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.Chris Meyer2010-10-044-27/+40
| * | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-0412-40/+235
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-10-0414-40/+244
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-09-302-0/+9
| | | |\ \ \ \ \ \
| | | | * | | | | | Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
| | | |/ / / / / /
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-09-2312-35/+235
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix compile failure in QtMultimedia.Andrew den Exter2010-09-231-3/+3
| | | | * | | | | | Verify the audio format before trying to open an audio device.Andrew den Exter2010-09-2212-35/+235
| | | |/ / / / / /