summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed some qdoc errors.Martin Smith2010-08-093-9/+8
|
* doc: Fixed some qdoc errors.Martin Smith2010-08-091-1/+1
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-2/+2
|\
| * OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0.Christian Kamm2010-08-091-2/+2
| | | | | | | | | | | | | | | | Previously, we would try to create one with samples = 1 anyway, potentially resulting in an INVALID_VALUE error. Task-number: QTBUG-12757 Reviewed-by: Samuel Rødal
* | doc: Fixed some qdoc errors.Martin Smith2010-08-092-7/+1
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-096-0/+9667
|\
| * Add Ukrainian translation.Victor Ostashevsky2010-08-096-0/+9667
| | | | | | | | | | Merge-request: 761 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | doc: Fixed some qdoc errors.Martin Smith2010-08-093-4/+4
|/
* doc: Fixed some qdoc errors.Martin Smith2010-08-098-17/+22
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-4/+4
|\
| * Doc: removing reduntant text from the index pageMorten Engvoldsen2010-08-091-4/+4
| |
* | doc: Fixed some qdoc errors.Martin Smith2010-08-094-5/+5
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-1/+1
|\
| * Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750Jerome Pasion2010-08-091-1/+1
| |
* | doc: Fixed some qdoc errors.Martin Smith2010-08-095-6/+7
|/
* doc: Fixed some qdoc errors.Martin Smith2010-08-091-63/+1
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-095-4629/+278
|\
| * I18N: Update German translations for 4.7.0.Friedemann Kleint2010-08-095-4629/+278
| |
* | doc: Fixed some qdoc errors.Martin Smith2010-08-091-6/+11
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0681-3118/+6846
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Modified descriptions of QBasicTimer class and isActive() function. Translation work for 4.7 Some more french translations. Some french translations doc: Re-introduced next/previous page links in the footer. Doc: Fixing validation bugs Removed duplicate case for const variable snippet. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some S60 qdoc errors. doc: Fixed some missing images. Adding Getting Started files. Auto test passes. Changed width of the document. Part of the fix for QTBUG-12180 Revert "Doc: Adding GS QML example files" Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Adding a description for the Spectrum Analyzer demo. For QTBUG-12180 qdoc: added application flags in doc.pri and fixed QTBUG-12388 ...
| * Modified descriptions of QBasicTimer class and isActive() function.Jerome Pasion2010-08-061-3/+4
| | | | | | | | | | Reviewed by: David Boddie Task: QTBUG-12313
| * Translation work for 4.7Pierre Rossi2010-08-067-514/+3003
| | | | | | | | | | | | | | | | validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi
| * Some more french translations.qCaro2010-08-061-151/+156
| | | | | | | | Reviewed-by: Pierre
| * Some french translationsPierre Rossi2010-08-066-3071/+2549
| | | | | | | | Reviewed-by: gabi
| * 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
| | | | | | | | | | | | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-10411
| | * | 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
| | |/ | |/| | | | | | | Task-Nr: QTBUG-12278
| * | 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
| | | | | | | | | | | | | | | | | | | | Reviewed by: David Boddie
| * | | | doc: Fixed some missing images.Martin Smith2010-08-062-3/+1
| | |/ / | |/| | | | | | | | | | Task-nr: QTBUG-8246
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f13ebf52a0d091c6c72c97d2a13311e1e7c4a5cf. The given example does not meet the autotest requirements for QML examples. These involve that it starts without error messages, and that it follows our naming convention of the start file starting with a lowercase letter. Please run the tests/auto/declarative/examples before pushing new declarative examples. If new examples should be exempted from these checks, add them to the list of exceptions in that autotest.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0661-174/+1778
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Designer: Prevent rich text from being copied into style sheets. QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction qdoc: Removed three unused config variables. qdoc: Cleaned up the application option specification and use. Doc: Adding GS QML example files Doc: Images for QML GS Doc: Editied version of QML GS Doc: Adding text to GS page Fix link error when building Bearer application with Qt Mobility Doc: nesting up orphant pages
| | | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2443 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | | Move note on connectToBus() not actually being able to reconnect toRobin Burchell2010-08-051-4/+3
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connectToBus() documentation, where it belongs. This also fixes some bad English ("make be connected") by means of removing it. Merge-request: 2443 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
| * | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
| * | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
| * | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | Task-nr: QTBUG-12388
| * | | | qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-052-5/+7
| | |/ / | |/| | | | | | | | | | Task-nr: QTBUG-12388