summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix a typo in harfbuzz thai line breaking.Ritt Konstantin2010-07-211-1/+1
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-07-2121-917/+164
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-203-27/+8
| |\
| | * Removed some translationsRobert Loehning2010-07-201-24/+0
| | * doc: Fixed typos in QAbstractFileEngineIteratorRobert Loehning2010-07-201-3/+3
| | * Updated changelog for 4.7.Yoann Lopes2010-07-201-0/+5
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-202-9/+19
| |\ \
| | * | Added missing deployment to autotest.axis2010-07-201-1/+4
| | * | Fixed some deployment issues on Symbian.axis2010-07-201-2/+1
| | * | Fixed a QSplashScreen hanging bug in S60 3.1 devices.axis2010-07-201-6/+14
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-205-8/+102
| |\ \ \ | | |/ / | |/| / | | |/
| | * My 4.7.0 changesEskil Abrahamsen Blomfeldt2010-07-201-5/+52
| | * Fix a Headerview layout bugPierre Rossi2010-07-202-1/+22
| | * Qt does not build with qt_namespace on macosCarlos Manuel Duclos Vergara2010-07-201-2/+2
| | * Add a testcase for when peeking and then reading from a QIODeviceAndy Shaw2010-07-201-0/+26
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-207-96/+0
| |\ \ | | |/
| | * Remove some files as instructed by Legal department.Jason McDonald2010-07-207-96/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1911-10/+14
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1911-10/+14
| | |\ | |/ /
| | * Check in the correct configure.exeDaniel Molkentin2010-07-191-0/+0
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1911-10/+14
| | |\
| * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-194-776/+17
| |\ \ \ | | |/ / | |/| |
| | * | Extend the detection of CPU feature for x86Benjamin Poulain2010-07-192-1/+17
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-07-1952-793/+490
| | |\ \
| | * | | Remove some more unneeded files from libjpeg, avoiding GPLaavit2010-07-192-775/+0
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-191-1/+18
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Do image comparison with fuzzHarald Fernengel2010-07-191-1/+18
| |/ / /
* | | | Ensure that font sizes that are > 0 and < 1 are still respectedAndy Shaw2010-07-212-1/+27
| |_|/ |/| |
* | | Examples: Fix compilation with namespace.ck2010-07-198-8/+10
* | | Rebuilt configure.exeDaniel Molkentin2010-07-191-0/+0
* | | Make configure.exe accept -no-gif again, fix commentDaniel Molkentin2010-07-192-2/+4
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1932-714/+395
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-1932-714/+395
| |\ \ | | |/ | |/|
| | * Convert examples and demos to use Bearer Management.Aaron McCarthy2010-07-1924-711/+388
| | * Fixes deployment rules for embedded qml demos application.Aaron McCarthy2010-07-197-0/+7
| | * Fix build on Symbian.Aaron McCarthy2010-07-191-3/+0
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1919-78/+77
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-195-59/+32
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-195-12/+27
| | |\ \
| | * | | Remove the -use-blur option from qtdemoAlan Alpert2010-07-195-56/+1
| | * | | Add label to explain how to exit QML demosAlan Alpert2010-07-191-5/+33
| * | | | Fix ListView sections with QList<QObject*>Martin Jones2010-07-194-1/+12
| * | | | Doc error fixes.Martin Jones2010-07-194-4/+4
| | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-1912-27/+50
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-1924-27/+185
| | |\ \ | |_|/ / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1913-2/+137
|\ \ \ \
* \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-181-5/+28
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Corrected BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2Andreas Kling2010-07-181-4/+4
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-181-5/+28
| |\ \ \ \
| | * | | | Used aligned load and store when possible for the blending of ARGB32Benjamin Poulain2010-07-171-5/+28