summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-086-14/+11
* Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-086-427/+437
* qdoc: Removed debugging code.David Boddie2010-02-081-2/+0
* Doc: Updated the configuration file for the Simplified Chinese docs.David Boddie2010-02-081-11/+9
* qdoc: Standardized encoding names and updated the Chinese config files.David Boddie2010-02-054-2/+152
* Doc: Added Simplified Chinese documents and build rules for them.David Boddie2010-02-046-2/+1129
* Merge branch 'master' into qdoc-i18nDavid Boddie2010-02-0370-178/+24109
|\
| * QDir fix issues with (shared) cached listsJoão Abecasis2010-02-033-4/+195
| * qdoc3: Added support for the \qmlbasictype command.Martin Smith2010-02-036-8/+68
| * Move the Hungarian translation to the translations folderBenjamin Poulain2010-02-037-0/+0
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0314-4/+22229
| |\
| | * Add Qvfb hungarian translationLaszlo Papp2010-02-032-0/+345
| | * Add Qtconfig hungarian translationLaszlo Papp2010-02-032-0/+921
| | * Add Linguist hungarian translationLaszlo Papp2010-02-032-3/+2018
| | * Add Designer hungarian translationLaszlo Papp2010-02-032-0/+7024
| | * Add Qt help hungarian translationLaszlo Papp2010-02-032-0/+299
| | * Add Assistant hungarian translationLaszlo Papp2010-02-032-0/+1084
| | * Add Qt base hungarian translationLaszlo Papp2010-02-032-1/+10538
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-025-6/+197
| |\ \
| | * | QSortFilterProxyModel: Fix dynamic sorting when severals rows are added.Olivier Goffart2010-02-022-6/+79
| | * | QLabel: add setSelection, hasSelectedText, selectedText, selectionStart.David Faure2010-02-023-0/+118
| * | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-0222-76/+375
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-0210-20/+912
| | |\ \
| | * \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-0222-76/+375
| | |\ \ \
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-0211-14/+189
| | | |\ \ \
| | | | * | | Fixed maketestselftest failure with some MSVC versions.Rohan McGovern2010-02-021-0/+3
| | | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-018-12/+181
| | | | * | | Fix a problem with overlay icons in the fileiconproviderJens Bache-Wiig2010-02-011-2/+3
| | | | * | | Only set the _WIN32_WINNT define if it is not set or less than 0x0400Andy Shaw2010-02-011-0/+2
| | | |/ / /
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-0117-63/+191
| | | |\ \ \
| | | | * | | QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton ...ulf2010-02-011-3/+3
| | | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-2913-59/+183
| | | | * | | Fix autotest memory leakKent Hansen2010-01-291-1/+1
| | | | * | | Carbon: crash problem in QWidgetPrivate::hide_sys, v2Richard Moe Gustavsen2010-01-292-1/+3
| | | | * | | Carbon: crash problem in QWidgetPrivate::hide_sysRichard Moe Gustavsen2010-01-291-0/+2
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-023-8/+7
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge commit 'origin/master'Richard Moe Gustavsen2010-02-0218-51/+1044
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-022-29/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Revert "add QModelIndex::rowCount() and QModelIndex::ColumnCount convenience ...Olivier Goffart2010-02-022-29/+1
| |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-0110-20/+912
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-0110-20/+912
| | |\ \ \ \ \
| | | * | | | | Placate pedantic compiler warning modes on QGLBufferRhys Weatherley2010-02-012-15/+15
| | | * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Rhys Weatherley2010-02-0147-574/+670
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-018-16/+892
| | | | |\ \ \ \ \
| | | * | | | | | | Promote QPixmap::convertFromImage() to public API from Qt3SupportRhys Weatherley2010-02-012-4/+20
| | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Add the QGLBuffer class to Qt 4.7 for VBO'sRhys Weatherley2010-02-018-16/+892
| * | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-01256-1481/+4434
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-01256-1481/+4434
| | |\ \ \ \ \ \ | |/ / / / / / / | | | | | | _ / | | | | | | /
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-011-10/+10
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-291-10/+10
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |