summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1215-26/+259
|\
| * Doc: Fixing typoSergio Ahumada2011-01-121-1/+1
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1115-26/+259
| |\ |/ /
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1115-26/+259
| |\
| | * Only test control character handling in X11Jiang Jiang2011-01-111-0/+4
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1115-26/+255
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1115-26/+255
| | | |\
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1015-26/+255
| | | | |\
| | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2011-01-1091-1415/+4315
| | | | | |\
| | | | | * \ Merge branch 'qt-graphics-team-text-master'Eskil Abrahamsen Blomfeldt2011-01-1015-26/+255
| | | | | |\ \
| | | | | | * | Compile when qreal != doubleEskil Abrahamsen Blomfeldt2011-01-101-1/+1
| | | | | | * | Make application font family names locale sensitive in X11Jiang Jiang2011-01-062-2/+24
| | | | | | * | Rename QTextBlockFormat::AtLeastHeight -> MinimumHeightEskil Abrahamsen Blomfeldt2011-01-044-15/+11
| | | | | | * | Add line spacing to QTextBlockFormat, get/set functions, CSS supportJoshua Grauman2011-01-046-6/+154
| | | | | | * | Optimize texture glyph cacheEskil Abrahamsen Blomfeldt2010-12-214-12/+28
| | | | | | * | Disable certain GPOS features by defaultJiang Jiang2010-12-201-6/+35
| | | | | | * | Move advances for control character in Indic syllable shapingJiang Jiang2010-12-202-0/+18
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-01-1111-108/+60
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | QProcessManager: minor optimizationRitt Konstantin2011-01-111-10/+6
| * | | | | | | use qBinaryFind instead of bsearchKonstantin Ritt2011-01-111-14/+2
| * | | | | | | use qBinaryFind instead of bsearchKonstantin Ritt2011-01-112-53/+15
| * | | | | | | fix two more "comparison between signed and unsigned integer expressions" war...Konstantin Ritt2011-01-111-2/+2
| * | | | | | | fix 'QChar::QChar(char)' is deprecatedKonstantin Ritt2011-01-111-1/+1
| * | | | | | | fix another "comparison between signed and unsigned integer expressions"Konstantin Ritt2011-01-111-10/+10
| * | | | | | | fix warning "comparison between signed and unsigned integer expressions"Konstantin Ritt2011-01-111-1/+1
| * | | | | | | fix warning "missing braces around initializer for 'in_addr::<anonymous union>'"Konstantin Ritt2011-01-111-1/+2
| * | | | | | | fix warning "'SeedStorage* randTLS()' defined but not used"Konstantin Ritt2011-01-111-7/+7
| * | | | | | | remove unused header includeRitt Konstantin2011-01-111-3/+1
| * | | | | | | make the modifySemaphore() signal-safe on linuxRitt Konstantin2011-01-111-1/+6
| * | | | | | | fix/stabilizate the year sign change testRitt Konstantin2011-01-111-4/+4
| * | | | | | | deal with utcOffset in a correct wayRitt Konstantin2011-01-111-2/+4
|/ / / / / / /
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-01-112-8/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | handle O_NONBLOCK'ed pipes specific error on write()Ritt Konstantin2011-01-112-5/+12
| * | | | | | move POSIX-specific debug to qprocess_unix.cppRitt Konstantin2011-01-112-3/+2
| |/ / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-01-111-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-01-101-1/+4
| |\ \ \ \ \ |/ / / / / /
| * | | | | BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.Sergio Ahumada2011-01-101-1/+4
| |/ / / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-1029-204/+227
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | qmake: fix wrong case label in toString(subSystemOption)Joerg Bornemann2011-01-101-4/+0
| * | | | qt project files: create pkg-config files for mingwMark Brand2011-01-1022-23/+29
| * | | | qmake: write and install pkg-config files for mingwMark Brand2011-01-102-0/+15
| * | | | qmake: don't limit pkg-config writing to unix generatorMark Brand2011-01-104-182/+183
| * | | | qmake: fix double directory separatorMark Brand2011-01-101-2/+7
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-105-5/+12
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Fix reversed condition introduced in 9a6cfc07e5João Abecasis2011-01-101-1/+1
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-085-5/+12
| |\ \ \ |/ / / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-075-5/+12
| |\ \ \
| | * | | Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higherminiak2011-01-073-3/+3
| | * | | Fix compilation error on SolarisJoão Abecasis2011-01-071-0/+6
| | * | | Check elapsed time only onceJoão Abecasis2011-01-071-2/+3