summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of ../oslo-staging-2 into 4.7David Boddie2010-08-1367-1703/+1944
|\
| * Doc: Removed invalid entities in documentation.David Boddie2010-08-101-2/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0998-3136/+6942
| |\
| | * 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
| | |\
| * | | Doc: Fixes to Qt Quick documentation.David Boddie2010-08-0914-1470/+1159
| |/ /
| * | 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
| * | | | Doc: Fixed qdoc warnings.David Boddie2010-08-0520-40/+130
| * | | | 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-04927-8269/+33582
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-16282-3607/+5403
| |\ \ \ \ \ \
| * | | | | | | Doc: Fixed typo.David Boddie2010-07-161-1/+1
| * | | | | | | Doc: Fixed QML documentation errors.David Boddie2010-07-162-4/+4
| * | | | | | | Doc: Merged in some of Thomas Zander's suggestions.David Boddie2010-07-161-2/+47
| * | | | | | | Doc: Fixed name clash.David Boddie2010-07-161-1/+0
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-12650-14435/+19598
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-30263-1771/+4239
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Made the Gestures Programming document more visible.David Boddie2010-06-303-5/+31
| * | | | | | | | | Doc: Synchronize HTML templates for each language.David Boddie2010-06-283-37/+170
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-241750-46175/+34590
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-21609-6932/+14035
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Doc: Started organizing Symbian platform deployment information.David Boddie2010-06-103-35/+78
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-11245-9474/+18075
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Doc: Fixing typoMorten Engvoldsen2010-08-111-1/+1
| * | | | | | | | | | | | Doc: Fixing bug involving header misplacement in Creator styleMorten Engvoldsen2010-08-111-2/+2
| * | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1118-46/+55
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-116-10/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | fix loading of module configsOswald Buddenhagen2010-08-114-5/+1
| | | * | | | | | | | | | | | don't load modules from qt.prfOswald Buddenhagen2010-08-111-3/+0
| | | * | | | | | | | | | | | add comment explaining why this file does magic instead of just voodooOswald Buddenhagen2010-08-111-0/+3
| | | * | | | | | | | | | | | configure.exe: don't write the QT_NAMESPACE define to .qmake.cacheJoerg Bornemann2010-08-111-1/+0
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-1113-37/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix cppextension examples.Martin Jones2010-08-1110-20/+20