summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-0992-3148/+6880
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0681-3118/+6846
| |\
| | * Modified descriptions of QBasicTimer class and isActive() function.Jerome Pasion2010-08-061-3/+4
| | * Translation work for 4.7Pierre Rossi2010-08-067-514/+3003
| | * Some more french translations.qCaro2010-08-061-151/+156
| | * Some french translationsPierre Rossi2010-08-066-3071/+2549
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-062-9/+5
| | |\
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-0672-1526/+2168
| | | |\
| | | | * Removed duplicate case for const variable snippet.Jerome Pasion2010-08-061-5/+0
| | | * | Doc: Fixing validation bugsMorten Engvoldsen2010-08-061-4/+5
| | * | | doc: Re-introduced next/previous page links in the footer.Martin Smith2010-08-061-0/+55
| | | |/ | | |/|
| | * | doc: Fixed some qdoc errors.Martin Smith2010-08-061-2/+3
| | * | doc: Fixed some qdoc errors.Martin Smith2010-08-062-30/+20
| | * | doc: Fixed some qdoc errors.Martin Smith2010-08-062-0/+33
| | * | doc: Fixed some S60 qdoc errors.Martin Smith2010-08-062-0/+54
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-0621-0/+1638
| | |\ \
| | | * | Adding Getting Started files. Auto test passes.Jerome Pasion2010-08-0620-0/+1603
| | | * | Changed width of the document. Part of the fix for QTBUG-12180Jerome Pasion2010-08-061-7/+3
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-0658-1843/+775
| | | |\ \
| | | * | | Adding a description for the Spectrum Analyzer demo. For QTBUG-12180Jerome Pasion2010-08-051-0/+39
| | * | | | doc: Fixed some missing images.Martin Smith2010-08-062-3/+1
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-0656-1838/+767
| | |\ \ \
| | | * | | Revert "Doc: Adding GS QML example files"Alan Alpert2010-08-0621-1617/+0
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-0661-174/+1778
| | | |\ \ \
| | | | * | | Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.Aaron McCarthy2010-08-061-1/+1
| | | | * | | Remove useless QString::clear() from QSharedData example snippet.Robin Burchell2010-08-051-1/+1
| | | | * | | Move note on connectToBus() not actually being able to reconnect toRobin Burchell2010-08-051-4/+3
| | | | |/ /
| | * | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | * | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | * | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-0/+1
| | * | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | * | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-052-5/+7
| | | |/ / | | |/| |
| | * | | Designer: Prevent rich text from being copied into style sheets.Friedemann Kleint2010-08-051-0/+1
| | | |/ | | |/|
| | * | QXmlPatterns QAbstractDateTime: only parse 3 digits of time fractionPeter Hartmann2010-08-054-1/+20
| | * | qdoc: Removed three unused config variables.Martin Smith2010-08-058-24/+0
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-0537-27/+1653
| | |\ \
| | | * | Doc: Adding GS QML example filesMorten Engvoldsen2010-08-0521-0/+1617
| | | * | Doc: Images for QML GSMorten Engvoldsen2010-08-0512-0/+0
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-055-1/+12
| | | |\ \
| | | | * | Fix link error when building Bearer application with Qt MobilityAlex2010-08-052-1/+8
| | | * | | Doc: Editied version of QML GSMorten Engvoldsen2010-08-051-25/+21
| | | * | | Doc: Adding text to GS pageMorten Engvoldsen2010-08-051-1/+7
| | * | | | qdoc: Cleaned up the application option specification and use.Martin Smith2010-08-055-116/+95
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-0574-930/+3152
| | |\ \ \ | | | |/ /
| | * | | Doc: nesting up orphant pagesMorten Engvoldsen2010-08-053-0/+4
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-065-28/+30
| |\ \ \ \
| | * | | | Fix broken example codeBea Lam2010-08-061-8/+11
| | * | | | Top-level QML item should not have special focus handling.Michael Brasser2010-08-062-8/+5
| | * | | | Fix index pageBea Lam2010-08-061-6/+5
| | * | | | Remove some warningsMartin Jones2010-08-051-6/+9