summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-14238-3536/+7637
|\
| * Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-1310-61/+21
| * Doc: Fixed non-well-formed XHTML.David Boddie2010-12-131-14/+14
| * Doc: Whitespace fix.David Boddie2010-12-131-1/+1
| * Added macros for floating images and floating images with alt text.David Boddie2010-12-131-0/+32
| * Fixed macro argument handling.David Boddie2010-12-131-5/+42
| * Removed trailing whitespace.David Boddie2010-12-131-25/+25
| * Doc: Temporarily used \qml...\endqml markup for the QML introduction.David Boddie2010-12-091-43/+32
| * Ensured that object definition identifiers are marked up as links.David Boddie2010-12-092-4/+13
| * Added hack to remove markup for opened comments at the end of snippets.David Boddie2010-12-091-0/+4
| * Removed redundant style information and images.David Boddie2010-12-094-53/+10
| * Used a different style class for areas containing QML markup.David Boddie2010-12-091-1/+1
| * Use the same style of qmake variable referencing used elsewhere in Qt.David Boddie2010-12-081-2/+2
| * Updated the build files to use config files not command line options.David Boddie2010-12-081-2/+2
| * Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-078-24/+78
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-073-4/+18
| | |\
| | * | Doc: Added missing What's New information for Qt 4.6 and 4.7.David Boddie2010-12-072-12/+58
| | * | Doc: Fixed incorrect case in a page file name.David Boddie2010-12-071-1/+1
| | * | Doc: Added a link to the QML Basic Types page.David Boddie2010-12-071-0/+1
| | * | Doc: Removed duplicate external page reference.David Boddie2010-12-071-5/+0
| | * | Doc: Fixed a link to the correct searchPaths() function.David Boddie2010-12-071-1/+1
| | * | Doc: Added documentation about the use of null custom title bar widgets.David Boddie2010-12-071-5/+12
| | * | Doc: Added a missing external page reference.David Boddie2010-12-071-0/+5
| * | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-07210-3325/+7384
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-063-4/+18
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-061-0/+3
| | | |\
| | | | * Fix QTextEdit::selectAll crash from textChanged()Jiang Jiang2010-12-061-0/+3
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-062-4/+15
| | | |\
| | | | * Fix proxy reading from gconf so that it is only done once / session.Jukka Rissanen2010-12-062-4/+15
| | | |/
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-06399-5118/+14799
| | |\ \
| | | * | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-0617-219/+713
| | | * | Added QML coding convention for "private" properties.Jerome Pasion2010-12-062-3/+64
| | | * | Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.Jerome Pasion2010-12-062-15/+24
| | | * | Some whitespace fixes.Jerome Pasion2010-12-061-32/+32
| | | * | Fixed a bug by changing the id name to lower case.Jerome Pasion2010-12-061-1/+1
| | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-03108-2594/+4587
| | | |\ \ | | | | |/
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-035-28/+81
| | | | |\
| | | | | * rebuild configureOswald Buddenhagen2010-12-031-0/+0
| | | | | * fix misleading uppercasing deprecation warningOswald Buddenhagen2010-12-031-3/+2
| | | | | * Enable Phonon on Symbian by default.Oleh Vasyura2010-12-031-0/+3
| | | | | * Disable OpenGL on Symbian only by default instead of alwaysOleh Vasyura2010-12-031-2/+4
| | | | | * VFP type on ARM option in Linux configure scriptOleh Vasyura2010-12-031-2/+27
| | | | | * Adding -dont-process option to Unix configure scriptOleh Vasyura2010-12-031-7/+20
| | | | | * Synchronized configure.exe OpenGL options with Unix configureOleh Vasyura2010-12-031-2/+23
| | | | | * build lrelease as part of the "libs" part.Oswald Buddenhagen2010-12-031-2/+2
| | | | | * purge vestiges of imageformat-pluginsMark Brand2010-12-032-10/+0
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-032-12/+19
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Unify epocroot usage in createpackage and patch_capabilities scriptsMiikka Heikkinen2010-12-032-12/+19
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0332-1113/+1119
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Update visual tests for the recent qmlviewer changeAlan Alpert2010-12-0331-1113/+1113