summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-268-38/+63
|\
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-251-1/+1
| |\
| | * Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-231-1/+1
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-08-186-12/+215
| | | |\
| | | | * Doc: Removed whitespace.David Boddie2011-06-301-1/+0
| | | | * Doc: Added a simple introduction to Qt and fixed links.David Boddie2011-06-165-5/+209
| | | | * Doc: Removed non-ASCII characters from the documentation.David Boddie2011-06-161-6/+6
| * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-191-2/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-181-2/+6
| | |\ \ \ | | | |/ /
| | | * | fix copying webkit guide under windowsOswald Buddenhagen2011-08-171-2/+6
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-192-26/+48
| |\ \ \ \
| | * \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-08-081-0/+3
| | |\ \ \ \
| | * | | | | Doc: Fixes to Qt tutorialGeir Vattekar2011-07-291-25/+47
| | * | | | | Fixed external link to DevNet Wiki.Jerome Pasion2011-07-281-1/+1
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-08-183-5/+5
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-183-5/+5
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Fix files that don't end with a newline characterSergio Ahumada2011-08-123-5/+5
| | | | |/ / / | | | |/| | |
| * | | | | | Improve documentation for QDeclarativeView::setSource()Keith Isdale2011-08-181-4/+3
| |/ / / / /
* | | | | | Fix a typo in qt-conf docs.Casper van Donderen2011-08-191-1/+1
* | | | | | Change spacing of title in offline style.Casper van Donderen2011-08-161-3/+9
|/ / / / /
* | | | | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1189-556/+3722
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtAaron Kennedy2011-08-0489-556/+3718
| |\ \ \ \ \ | | |/ / / /
| | * | | | Added -datatags option to QTestLibjasplin2011-07-261-0/+3
| | |/ / /
| | * | | Doc: Added a link to the How to Learn Qt document.David Boddie2011-07-191-1/+2
| | * | | Doc: Fixed shader program snippet.David Boddie2011-07-191-2/+2
| | * | | Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.David Boddie2011-07-181-2/+2
| | * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-142-16/+0
| | |\ \ \ | | | |/ /
| | | * | Remove broken link to Symbian.org documentation.Casper van Donderen2011-07-122-16/+0
| | * | | Doc: fix typoJoerg Bornemann2011-07-111-1/+1
| | * | | Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-083-5/+77
| | |\ \ \
| | | * \ \ Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-042-5/+42
| | | |\ \ \ | | | | |/ /
| | | | * | Update QtOpenGL section in Symbian platform notes.Jani Hautakangas2011-07-012-5/+42
| | | * | | Merge branch '4.8-upstream' into master-waterWater-Team2011-06-2978-508/+3258
| | | |\ \ \
| | | * | | | Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2011-06-271-0/+35
| | * | | | | Committing the qt-webpages.qdoc file with the online linksJerome Pasion2011-07-041-22/+22
| | * | | | | Preparing documentation package for 4.8-betaJerome Pasion2011-07-044-25/+142
| | * | | | | Doc: Removed whitespace.David Boddie2011-07-011-1/+0
| | * | | | | Doc: Added a simple introduction to Qt and fixed links.David Boddie2011-07-015-5/+209
| | * | | | | Doc: Removed non-ASCII characters from the documentation.David Boddie2011-07-011-6/+6
| | | |/ / / | | |/| | |
| | * | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-277-77/+77
| | * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-245-11/+35
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-202-24/+7
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Qmlshadersplugin examples added.Marko Niemelä2011-06-133-11/+22
| | | * | | Qmlshadersplugin API documentation enhancements.Marko Niemelä2011-06-132-0/+13
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-221-18/+23
| | |\ \ \ \
| | | * | | | docu update for QNX 6.5Ritt Konstantin2011-06-211-18/+23
| | | | |_|/ | | | |/| |
| | * | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-175-18/+54
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-082-24/+7
| | | |\ \ \
| | | | * \ \ Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7Toby Tomkins2011-06-081-0/+11
| | | | |\ \ \
| | | | * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-24/+7
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |