summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-293-23/+2
|\
| * Lighthouse: fix QDirectFbScreen::depth to not be fixed to 32Jørgen Lind2010-09-161-1/+1
| * Lighthouse: Remove auto building platform pluginsJørgen Lind2010-09-162-22/+1
* | Compile when detecting ARMv5Bradley T. Hughes2010-09-271-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-27713-7292/+25487
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-09-262-0/+10
| |\ \
| | * | Fix QPainter::clipBoundingRect() for QRectF clip.Andreas Kling2010-09-262-0/+10
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-252-10/+18
| |\ \
| | * | Fix problems in QTextureGlyphCache caused by insufficient mergeEskil Abrahamsen Blomfeldt2010-09-242-10/+18
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-09-232-56/+95
| |\ \
| | * | Designer/QFormBuilder::save(): Fix traversal of QGridLayout/QFormLayoutFriedemann Kleint2010-09-232-56/+95
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-09-2314-442/+671
| |\ \ \ | | |/ /
| | * | Add support for ARMv7 atomic operationsBradley T. Hughes2010-09-235-54/+179
| | * | Fix usage of QT_ARCH_ARM* after a28ddf6Bradley T. Hughes2010-09-232-3/+3
| | * | Merge the armv6 and arm architecturesBradley T. Hughes2010-09-238-390/+63
| | * | Copy src/corelib/arch/qatomic_arm.h to src/corelib/arch/qatomic_armv5.hBradley T. Hughes2010-09-231-0/+431
| | * | Move symbian specific qatomic_generic_armv6.cppBradley T. Hughes2010-09-232-1/+1
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-221-0/+13
| |\ \
| | * | Adding C++0x support to MSVC2010Thierry Bastian2010-09-221-0/+13
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-09-2244-336/+503
| |\ \ \ | | |/ / | |/| |
| | * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2244-336/+503
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-09-221-2/+2
| | | |\ \
| | | | * | Fix audio glitches in the audiooutput example.Andrew den Exter2010-09-221-2/+2
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-2233-227/+383
| | | |\ \ \
| | | | * | | apply msvc flags to wince tooRomain Pokrzywka2010-09-212-2/+2
| | | | * | | fix qt static build on winceRomain Pokrzywka2010-09-212-14/+15
| | | | * | | fix build with QT_NO_GESTURESRomain Pokrzywka2010-09-211-1/+1
| | | | * | | qmake: fix quoting of moc callsJoerg Bornemann2010-09-211-2/+2
| | | | * | | Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QCharThiago Macieira2010-09-211-1/+1
| | | | * | | Regenerate the Unicode tables after updates to the generator toolThiago Macieira2010-09-212-65/+82
| | | | * | | Compile in C++0x modeThiago Macieira2010-09-211-1/+1
| | | | * | | remove extra includesRitt Konstantin2010-09-2111-10/+1
| | | | * | | minor clean-upsRitt Konstantin2010-09-211-26/+21
| | | | * | | minor improvements for data parsersRitt Konstantin2010-09-211-61/+77
| | | | * | | tiny clean-up for generated dataRitt Konstantin2010-09-211-2/+4
| | | | * | | move QUnicodeTables:: script() and lineBreakClass() implementationsRitt Konstantin2010-09-212-17/+18
| | | | * | | make lupdate test less fragileOswald Buddenhagen2010-09-212-2/+8
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-2010-23/+150
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | Enable building Qt/Webkit with debug symbolsAnders Bakken2010-09-203-23/+45
| | | | | * | Add breakpad supportMarco Bubke2010-09-207-0/+105
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2228-131/+96
| | | |\ \ \ \
| | | | * | | | Fixed drawing a large number of glyphs with the same font under GL.Trond Kjernåsen2010-09-214-9/+30
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jason McDonald2010-09-213-72/+16
| | | | |\ \ \ \
| | | | | * | | | Qt headers must be included before X11 headersBenjamin Poulain2010-09-211-3/+3
| | | | | * | | | Fixes bezier curves not being drawn when it is a line.Yoann Lopes2010-09-211-41/+0
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-09-210-0/+0
| | | | | |\ \ \ \
| | | | | * | | | | Avoid creating copy of an image in memory when storing as jpegaavit2010-09-211-28/+13
| | | | | | |/ / / | | | | | |/| | |
| | | | * | | | | Bump version to 4.7.1.Jason McDonald2010-09-2121-50/+50
| | | | | |/ / / | | | | |/| | |
| | | | * | | | Merge commit 'v4.7.0' into 4.7Jason McDonald2010-09-210-0/+0
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbianv4.7.0Juha Turunen2010-09-102-134/+136