summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | qdoc: Fixed non-well-formed markup.David Boddie2010-08-092-14/+13
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-0585-348/+2415
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge commit 'refs/merge-requests/2443' of git://gitorious.org/qt/qt into int...David Boddie2010-08-052-5/+4
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Remove useless QString::clear() from QSharedData example snippet.Robin Burchell2010-07-271-1/+1
| | | | * | | | | | | | | Move note on connectToBus() not actually being able to reconnect toRobin Burchell2010-07-271-4/+3
| | | * | | | | | | | | | Doc: Fixed typo in a shortcut string.David Boddie2010-08-041-1/+1
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-04909-8752/+29584
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Doc: Added more license information.David Boddie2010-07-162-8/+161
| | * | | | | | | | | | | | doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-112-3/+5
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1118-46/+55
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | qdoc: Added list of all members (including inherited) page to QML elements.Martin Smith2010-08-118-24/+113
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-123-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Only modify pixmap cache reply when protected by a mutexAaron Kennedy2010-08-122-1/+11
| * | | | | | | | | | | | | Fix broken example codeBea Lam2010-08-121-5/+8
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-1267-279/+1688
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-08-1120-50/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix typos in docsThomas Zander2010-08-111-3/+3
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-1159-238/+983
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'hfw_2nd' into 4.7Jan-Arve Sæther2010-08-117-19/+682
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix (implement!) hfw/wfh in QGridLayoutEngineJan-Arve Sæther2010-08-105-17/+678
| | * | | | | | | | | | | | | | Fixed a bug in implementation of sizeHint() when there was a constraintJan-Arve Sæther2010-08-102-2/+4
| * | | | | | | | | | | | | | | Layout items had the wrong size if the layout was resized to maximum.Jan-Arve Sæther2010-08-112-19/+20
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Disable minRightBearing optimization in QTextLayout on MacEskil Abrahamsen Blomfeldt2010-08-111-0/+2
| * | | | | | | | | | | | | | Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-11107-4850/+10499
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-1060-239/+980
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Added one test for QRegExpOlivier Goffart2010-08-101-0/+18
| | * | | | | | | | | | | | | | | QMetaObject::normalizeSignature avoid reading past the string in case of inv...Olivier Goffart2010-08-102-3/+8
| | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-1057-236/+954
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Add text decoration support to QStaticTextJiang Jiang2010-08-102-13/+177
| | | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-1055-223/+777
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Fix QString::arg: When specifying %L1, the group separator would be added eve...Olivier Goffart2010-08-092-5/+20
| | | | * | | | | | | | | | | | | | QtDeclarative: get rid of warnings in public headerOlivier Goffart2010-08-093-6/+9
| | | | * | | | | | | | | | | | | | doc: Clarify documentation of QStaticTextEskil Abrahamsen Blomfeldt2010-08-091-4/+12
| | | | * | | | | | | | | | | | | | Fix scrollbar randomly popping up in QPlainTextEditEskil Abrahamsen Blomfeldt2010-08-092-4/+47
| | | | * | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-0992-3148/+6880
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0649-450/+1139
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Remove the definition of QT_HAVE_NEON from qt.prfBenjamin Poulain2010-08-063-3/+6
| | | | | * | | | | | | | | | | | | | Use the fast Neon conversion for converting colors of jpeg images.Benjamin Poulain2010-08-061-2/+9
| | | | | * | | | | | | | | | | | | | Do the conversion from RGB888 to RGB32 using NeonBenjamin Poulain2010-08-063-0/+123
| | | | | * | | | | | | | | | | | | | Move the build of Neon file from painting.pri to gui.proBenjamin Poulain2010-08-062-18/+21
| | | | | * | | | | | | | | | | | | | QSharedPointer documentation: specify that it is not safe to operate on the s...Olivier Goffart2010-08-061-2/+2
| | | | | * | | | | | | | | | | | | | compilation with QT_NO_DEPRECATEDOlivier Goffart2010-08-061-0/+2
| | | | | * | | | | | | | | | | | | | Test we do not have compiler warnings in our headers with more optionsOlivier Goffart2010-08-061-2/+5
| | | | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-069-54/+103
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-051-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | QStyleSheet documentation: QMenu's tear-off is styled with ::tearoffOlivier Goffart2010-08-051-2/+2
| | | | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0557-881/+3020
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | Fix QTextEngine overflow caused by extremely long textJiang Jiang2010-08-053-33/+87
| | | | | * | | | | | | | | | | | | | | Replace the SSE prologues by a macroBenjamin Poulain2010-08-053-17/+9
| | | | | * | | | | | | | | | | | | | | QDom: Do not crash on "<a:>text</a:>"Frank Osterfeld2010-08-052-2/+5