summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Doc: Updated example license to three clause BSD license.David Boddie2010-06-10833-23177/+22345
* Doc: Fixed whitespace in the other configuration file for zh_CN.David Boddie2010-06-071-22/+22
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-079-10/+105
|\
| * Unbreak Linux build when qendian.h is included before qglobal.hAndreas Kling2010-06-071-0/+1
| * Revert accidental commit of irrelevant stuff. Silly mondays..Andreas Kling2010-06-075-38/+28
| * Unbreak Linux build when qendian.h is included before qglobal.hAndreas Kling2010-06-075-28/+38
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-s...Denis Dzyubenko2010-06-07375-7220/+21922
| |\
| * | Fix QApplication/QWidget to really take ownership of input contextsMichael Hasselmann2010-06-074-7/+21
| * | Added setting a hotspot on standard gesturesDenis Dzyubenko2010-06-071-0/+3
| * | Fixed GestureOverride event delivery in GraphicsView.Denis Dzyubenko2010-06-072-1/+74
| * | Reset gesture when in MayBeGesture state.Denis Dzyubenko2010-06-021-2/+6
* | | Doc: Fixed whitespace in the Simplified Chinese doc configuration.David Boddie2010-06-071-26/+26
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-0727-98/+229
|\ \ \ | | |/ | |/|
| * | add check-ts target to auto-asses translation completenessOswald Buddenhagen2010-06-073-1/+92
| * | qt_ja_JP.ts => qt_ja.tsOswald Buddenhagen2010-06-072-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0720-51/+96
| |\ \
| | * | Fix incorrect \since tagSimon Hausmann2010-06-071-1/+1
| | * | XQuery test suite (and others): remove p4 dependencyPeter Hartmann2010-06-071-4/+0
| | * | add docu about pixmaps being invalidated on qapp destructionOswald Buddenhagen2010-06-071-0/+3
| | * | remove somewhat misleading warning about x11 pixmap leakOswald Buddenhagen2010-06-071-4/+2
| | * | Disabled item view items use incorrect background colorJens Bache-Wiig2010-06-072-3/+4
| | * | Update the mkspec for linux-icc: don't use jump tables in shlibsThiago Macieira2010-06-071-3/+3
| | * | Update the linux-icc mkspecThiago Macieira2010-06-071-8/+9
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0714-29/+75
| | |\ \
| | | * | make corewlan more namespace friendlyLorn Potter2010-06-061-8/+17
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0513-21/+58
| | | |\ \
| | | | * | Add convenience constructor to QTextOption::TabDavid Faure2010-06-045-20/+15
| | | | * | Make qbswap() use glibc's fast bswap_*() functions if available.Andreas Kling2010-06-041-0/+26
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-071-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fixed `make install' for qmediaplayer demo.Rohan McGovern2010-06-071-1/+1
| | |/ / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-079-45/+56
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-059-45/+56
| | |\ \ \ | |/ / / /
| | * | | Merge branch 'def_files_and_plugins' into 4.7-s60axis2010-06-049-45/+56
| | |\ \ \
| | | * | | Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-048-39/+45
| | | * | | Fixed def file usage for the makefile build system on the SDK plugin.axis2010-06-041-6/+11
* | | | | | Merge commit 'refs/merge-requests/2408' of git://gitorious.org/qt/qt into int...David Boddie2010-06-0760-5369/+14189
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | * Add Japanese tutorial documentsTakumi ASAKI2010-06-0724-1/+3595
| |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-047-41/+269
| |\ \ \ \
| | * | | | Fixed unescaped backslashes in testcase.prfRohan McGovern2010-06-041-2/+2
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-047-41/+269
| | |\ \ \ \
| | | * | | | Skip tst_maketestselftest::make_check by default on WindowsRohan McGovern2010-06-041-0/+3
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-037-41/+266
| | | |\ \ \ \
| | | | * | | | Fixed tst_maketestselftest on QWS and Windows.Rohan McGovern2010-06-033-5/+26
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-037-41/+245
| | | | |\ \ \ \
| | | | | * | | | Add a test for the `make check' feature.Rohan McGovern2010-06-025-6/+179
| | | | | * | | | Fix `make check' for debug-and-release on Windows.Rohan McGovern2010-06-021-2/+16
| | | | | * | | | Move `check' target for autotests into testcase.prfRohan McGovern2010-06-022-35/+52
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-0416-20/+668
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Updated WebKit to 903617844b4341f7098b63b54e5be16cd83af647Simon Hausmann2010-06-044-4/+20
| | * | | | | | | | Updated WebKit to de1e909b06cbc981d63e0fc0f6a3f84002dd1e80Simon Hausmann2010-06-0416-18/+650
| | |/ / / / / / /