summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | Doc: Fixed typo.David Boddie2011-04-281-1/+1
| * | | | | | Doc: Added a code snippet to clarify the use of a function.David Boddie2011-04-282-0/+80
| * | | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-2721-63/+165
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-18453-8746/+18188
| |\ \ \ \ \ \
| * | | | | | | Doc: Added a note about the dll CONFIG option.David Boddie2011-04-181-3/+4
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-2521-26/+638
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: Added QtWebKit examples from Qt Quarterly 26 and 32.David Boddie2011-03-107-0/+681
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-10115-1971/+3979
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Mentioned the QQ Parenthesis article in two examplesGeir Vattekar2011-01-212-1/+13
| * | | | | | | | | Doc: Work on GettingStartedQt tutorialGeir Vattekar2011-01-211-110/+114
* | | | | | | | | | Doc: Added some more information about visited links in rich text.David Boddie2011-05-251-0/+4
* | | | | | | | | | Doc: Added a note about the <style> element in rich text strings.David Boddie2011-05-251-1/+5
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-24579-6013/+5899
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-206-61/+56
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-192-7/+2
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-181-109/+0
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-161-0/+123
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindowRichard Moe Gustavsen2011-05-111-1/+1
| | | * | | | | | | | | | QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-091-6/+1
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-109/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-161-0/+123
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13578-5906/+5906
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-17573-5843/+5843
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | / / | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-17573-5842/+5842
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update licenseheader text in source filesJyri Tahtela2011-05-13573-5842/+5842
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-131-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |