summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into inte...David Boddie2010-01-281-2/+2
|\
| * doc: Fix qmake-manual warn_on/warn_off referencesAdemar de Souza Reis Jr2009-12-031-2/+2
* | Merge branch 'master' into staging-1-masterPaul Olav Tvete2010-01-251257-1654/+2570
|\ \
| * \ Merge branch '4.6'Thiago Macieira2010-01-213-5/+5
| |\ \
| | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-204-8/+47
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-191-1/+1
| | | |\ \
| | | | * | Fix copyright year.Jason McDonald2010-01-191-1/+1
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-191-1/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix TypoThomas Zander2010-01-191-1/+1
| | * | | | Doc: Fixed some earlier incorrect documentation fixes.David Boddie2010-01-201-3/+3
| | | |/ / | | |/| |
| * | | | Merge branch '4.6'Thiago Macieira2010-01-1819-149/+895
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-182-6/+45
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Describe patch-capabilities in the install instructions.Shane Kearns2010-01-182-6/+45
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-151-2/+2
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-141-2/+2
| | | |\ \
| | | | * | Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-141-1/+1
| | | | * | Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-141-1/+1
| | * | | | Doc: Added placeholder pages for new examples and updated the overviews.David Boddie2010-01-1513-131/+835
| | |/ / /
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-136-32/+48
| | |\ \ \
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-131-3/+3
| | | |\ \ \
| | | * | | | doc: This bug wasn't really a bug; it just required clarification.Martin Smith2010-01-132-9/+12
| | | | |/ / | | | |/| |
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-115-31/+68
| | |\ \ \ \
| | * | | | | Doc: Clarified why a path matches in the example given.David Boddie2010-01-081-1/+1
| * | | | | | Doc: Cocoa is now the default Mac port.Morten Johan Sørvig2010-01-151-21/+19
| * | | | | | Merge branch '4.6'Thiago Macieira2010-01-131244-1316/+1396
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-131244-1313/+1394
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-122-4/+4
| | | |\ \ \ \
| | | | * | | | doc: update snippets for QtScript function expressionsKent Hansen2010-01-122-4/+4
| | | | | |/ / | | | | |/| |
| | | * | | | doc: Updated the descriptions of the connection types.Martin Smith2010-01-121-16/+29
| | | |/ / /
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-112-6/+23
| | | |\ \ \
| | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-091244-1293/+1344
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-091244-1293/+1344
| | | | | |\ \ \
| | | * | | | | | doc: Added clarification about allocating space for the 0 terminator.Martin Smith2010-01-111-0/+17
| | | | |_|/ / / | | | |/| | | |
| | | * | | | | doc: Fixed typos.Martin Smith2010-01-081-8/+7
| | | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-083-12/+60
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-081-2/+2
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | Doc: Added license information for the Symbian version of qtmain.David Boddie2010-01-071-5/+47
| | | | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-071244-1280/+1302
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-062-3/+3
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Doc: Improved the advice about deployment of plugins.David Boddie2010-01-061-4/+10
| | | | * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-183-3/+47
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Doc: Fixed comments in a code snippet.David Boddie2009-12-181-1/+1
| | | * | | | | | | | | doc: Explained parameter value defaults where appropriate.Martin Smith2010-01-081-23/+27
| | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | doc: Corrected parameter value in snippet.Martin Smith2010-01-071-1/+1
| | | * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-065-20/+42
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Update copyright year to 2010Jason McDonald2010-01-061244-1259/+1259
| | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-091-3/+3
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-091-3/+3
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | | | * | | | | | | Doc typos fixedJarek Kobus2010-01-081-3/+3
| | | | | |_|_|_|/ / | | | | |/| | | | |
| * | | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-122-6/+23
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /