summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Doc: Tidied up the class layout and removed an unnecessary image.David Boddie2010-02-091-15/+13
* Merge branch 'qdoc-i18n'David Boddie2010-02-0927-520/+1844
|\
| * 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
| |\
| * | qdoc: Added support for different source and output character encodings.David Boddie2010-02-0210-84/+125
| * | Doc: Synchronize configuration files for easier maintenance.David Boddie2010-02-022-4/+5
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0818-233/+400
|\ \ \
| * | | Revised fix for system tray popup activationJens Bache-Wiig2010-02-051-1/+4
| * | | Fixed draggabletext example.Denis Dzyubenko2010-02-051-1/+1
| * | | Added new mouse cursor types.Denis Dzyubenko2010-02-0513-231/+381
| * | | Doc: more \since 4.7Volker Hilsheimer2010-02-052-0/+6
| * | | Doc: add \since 4.7 to new functions.Volker Hilsheimer2010-02-051-0/+8
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-056-45/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running"Tor Arne Vestbø2010-02-052-41/+9
| * | | Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-052-1/+3
| * | | Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-052-3/+18
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-054-39/+40
|\ \ \ \ | |/ / / |/| | |
| * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-2/+0
| * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-14/+16
| * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-23/+0
| * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-0/+24
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-052-0/+39
|\ \ \ \ | |/ / / |/| | |
| * | | Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-052-0/+39
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0422-273/+630
|\ \ \ \ | |/ / / |/| | |
| * | | Use a shared QScriptEngine for debugger console command scriptsKent Hansen2010-02-043-229/+233
| * | | Fix QtScript debugger hang/crash issue with updating locals modelKent Hansen2010-02-042-16/+44
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-042-2/+2
| |\ \ \
| | * | | Always activate popup windows on showJens Bache-Wiig2010-02-042-2/+2
| * | | | doc: Fixed some qdoc warnings.Martin Smith2010-02-045-14/+36
| |/ / /
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-044-9/+16
| |\ \ \
| | * | | Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| | * | | Cocoa: Tool Windows steal focus from the main windowRichard Moe Gustavsen2010-02-043-9/+3
| * | | | doc: Fixed some qdoc warnings.Martin Smith2010-02-043-1/+30
| |/ / /
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-042-0/+269
| |\ \ \
| | * | | Update QTestLib documentation with chart use case.Fabien Freling2010-02-042-0/+269
| * | | | qdoc3: Removed a debug output.Martin Smith2010-02-041-2/+0
| |/ / /
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-043-6/+74
|\ \ \ \
| * | | | Fixed wrong variable nameGabriel de Dietrich2010-02-041-1/+1
| * | | | QHeaderView: fixes sectionClicked() emitted with wrong section indexOlivier Goffart2010-02-042-5/+73
* | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-04138-578/+30474
|\ \ \ \ \
| * \ \ \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-04138-578/+30474
| |\ \ \ \ \ |/ / / / / /
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-041-2/+7
| |\ \ \ \ \
| | * | | | | Rhys Weatherley's changes for 4.6.2Rhys Weatherley2010-02-041-2/+7
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0420-216/+805
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0320-216/+805
| | |\ \ \ \ \ \