summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fixed autotest failure in tst_qgl::clipTest.Samuel Rødal2010-08-121-0/+1
* Added way to destroy the share widget in the GL graphics system.Samuel Rødal2010-08-122-0/+20
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-126-128/+150
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-116-128/+150
| |\
| | * Fix some #ifdefs to compile for a specific combination of featuress that was ...Trever Fischer2010-08-111-0/+6
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-114-125/+140
| | |\
| | | * 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256Andreas Kling2010-08-111-73/+67
| | | * QXmlStreamReader: avoid unnecessary detachingPeter Hartmann2010-08-111-1/+1
| | | * QSslCertificate: support expiration dates > 2049Peter Hartmann2010-08-111-50/+71
| | | * Doc: Fixing typoMorten Engvoldsen2010-08-111-1/+1
| | * | doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-111-3/+4
| | |/
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-122-6/+9
|\ \ \
| * | | Only modify pixmap cache reply when protected by a mutexAaron Kennedy2010-08-121-1/+1
| * | | 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-1241-161/+820
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-08-113-17/+30
| |\ \ \
| | * | | 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-1134-136/+487
| | |\ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'hfw_2nd' into 4.7Jan-Arve Sæther2010-08-116-15/+322
| |\ \ \ \
| | * | | | Fix (implement!) hfw/wfh in QGridLayoutEngineJan-Arve Sæther2010-08-104-13/+318
| | * | | | 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-111-7/+8
| | |_|/ / | |/| | |
| * | | | Disable minRightBearing optimization in QTextLayout on MacEskil Abrahamsen Blomfeldt2010-08-111-0/+2
| * | | | Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-1151-77/+86
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-1034-136/+485
| |\ \ \ \ \
| | * | | | | QMetaObject::normalizeSignature avoid reading past the string in case of inv...Olivier Goffart2010-08-101-1/+4
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-1033-135/+481
| | |\ \ \ \ \
| | | * | | | | Add text decoration support to QStaticTextJiang Jiang2010-08-101-13/+71
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-1032-122/+410
| | | |\ \ \ \ \
| | | | * | | | | Fix QString::arg: When specifying %L1, the group separator would be added eve...Olivier Goffart2010-08-091-5/+8
| | | | * | | | | QtDeclarative: get rid of warnings in public headerOlivier Goffart2010-08-092-6/+6
| | | | * | | | | doc: Clarify documentation of QStaticTextEskil Abrahamsen Blomfeldt2010-08-091-4/+12
| | | | * | | | | Fix scrollbar randomly popping up in QPlainTextEditEskil Abrahamsen Blomfeldt2010-08-091-4/+17
| | | | * | | | | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-0921-67/+155
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0628-165/+242
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Remove the definition of QT_HAVE_NEON from qt.prfBenjamin Poulain2010-08-062-2/+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
| | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-067-52/+100
| | | | | |\ \ \ \ \ \
| | | | * | \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0526-285/+459
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | | * | | | | | | 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-051-2/+4
| | | | * | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-08-059-18/+110
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-042-2/+2
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-04407-3353/+20839
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1699-892/+1528
| | | | |\ \ \ \ \ \ \ \ \ \