summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | Check for buffer overflow in Lookup_MarkMarkPosJiang Jiang2011-07-191-0/+3
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-07-193-4/+78
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Delay masking the last character in Password echo mode.Andrew den Exter2011-07-193-4/+78
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-182-2/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Prevent failed rendering for NPOT textures in GLES2.Samuel Rødal2011-07-181-1/+3
| | | * | | | | | | | | | | | | Don't use GL_REPEAT for NPOT textures in GLES2.Samuel Rødal2011-07-181-1/+12
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-182-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Avoid crash when surface creation fails.Laszlo Agocs2011-07-182-3/+3
* | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-07-202-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | importing QtDeclarative classes for usage in QML designerThomas Hartmann2011-07-191-2/+2
| * | | | | | | | | | | | | | | fix QFileInfo::isSymLink() for NTFS mount pointsJoerg Bornemann2011-07-191-2/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-195-20280/+39941
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add docs for QSqlRelationalTableModel::JoinModeCharles Yin2011-07-191-0/+12
| * | | | | | | | | | | | | | Fixed behavior on NULL foreign keysDaNiMoTh2011-07-192-12/+57
| * | | | | | | | | | | | | | Forward port qt modifications for sqlite3.cCharles Yin2011-07-191-2/+16
| * | | | | | | | | | | | | | Forward port the vxworks changesCharles Yin2011-07-191-3/+28
| * | | | | | | | | | | | | | Update sqlite to 3.7.7.1Charles Yin2011-07-193-20292/+39857
* | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-181-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-181-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-181-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Fixes leaking X11 SyncCounter when widgets get open/destroyedAleksandar Stojiljkovic2011-07-181-0/+6
* | | | | | | | | | | | | | Fix the timeout calculation for futexes in QMutex.Thiago Macieira2011-07-151-6/+22
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-07-152-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | namespace fixJoerg Bornemann2011-07-142-4/+5
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-141-10/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | / / / / / / / / / / | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Documentation fix.Casper van Donderen2011-07-141-10/+6
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-142-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Fix potential crash when clicking in a text editEskil Abrahamsen Blomfeldt2011-07-131-0/+1
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-121-2/+8
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Compensate for different rounding rule in CG engineJiang Jiang2011-07-121-2/+8
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-123-44/+117
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Check engine existence before increasing reference countJiang Jiang2011-07-121-3/+6
| | * | | | | | | | | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-07-111-0/+15
| | * | | | | | | | | Optimize text layout.Michael Brasser2011-07-113-25/+71
| | * | | | | | | | | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-115-2/+13
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Backporting fix for QTBUG-18716Tomi Vihria2011-07-115-2/+13
* | | | | | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-07-13159-2745/+4148
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-128-50/+58
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | Merge remote branch 'review/master' into stagingJiang Jiang2011-07-128-50/+58
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Fix compiler warning in qtextdocument.cppEskil Abrahamsen Blomfeldt2011-07-111-1/+1
| | | * | | | | | | | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| | | * | | | | | | | Use truncate only for subpixel boundingBox x positionJiang Jiang2011-07-082-2/+2
| | | * | | | | | | | Use more numerically robust algorithm to compute QBezier::pointAt().Samuel Rødal2011-07-081-18/+18
| | | * | | | | | | | Fix editable combobox style on MacJiang Jiang2011-07-071-5/+5
| | | * | | | | | | | Revert 344a4dcfe and part of 93bce787Jiang Jiang2011-07-072-6/+5
| | | * | | | | | | | Fix raster subpixel positioning in LionJiang Jiang2011-07-071-1/+1
| | | * | | | | | | | Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-0713859-1043359/+2122894
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-07-1210-128/+615
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |