summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-272-24/+7
| | | | | |\ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | | * | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-272-24/+7
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-082-0/+38
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-06579-6013/+6022
| | | | |\ \ \ \ | | | | | |/ / /
| | | | * | | | Add the new 'glhypnotizer' demo.Jason Barron2011-06-032-0/+38
| | | * | | | | Document the Symbian main window size issue at application start.Miikka Heikkinen2011-05-251-0/+11
| | | | |/ / / | | | |/| | |
| | * | | | | Doc: Added missing license headers for documentation and examples.David Boddie2011-06-085-55/+55
| | * | | | | Merge branch '4.8'David Boddie2011-06-081-0/+7
| | |\ \ \ \ \
| | | * | | | | Doc: Added a snippet to show how to test the Qt version.David Boddie2011-06-031-0/+7
| | * | | | | | Doc: Fixed links.David Boddie2011-06-072-2/+2
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-05-273-76/+401
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | converted to unix txt fileVladimir Minenko2011-05-261-218/+218
| | | * | | | | try to resolve CRLR problemsVladimir Minenko2011-05-261-3/+2
| | | * | | | | "TAB character in non-leading whitespace" fixedVladimir Minenko2011-05-261-45/+43
| | | * | | | | * fixed trailing- and whitespacesVladimir Minenko2011-05-262-76/+91
| | | * | | | | Merge remote-tracking branch 'origin/master'Vladimir Minenko2011-05-26609-6402/+7975
| | | |\ \ \ \ \
| | | * | | | | | * "How To Learn Qt" is almost complete. Last section is missingVladimir Minenko2011-05-253-134/+439
| | | * | | | | | table of contentVladimir Minenko2011-05-131-2/+20
| | | * | | | | | Doc: Fixed typo.David Boddie2011-05-021-1/+1
| | | * | | | | | Fixing potential js hole in the js function for the feedback channel.Morten Engvoldsen2011-04-291-1/+1