summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-146-9/+78
|\
| * QPointer: thread safetyOlivier Goffart2010-12-132-0/+34
| * Make sure num_glyphs pass to HarfBuzz is large enoughJiang Jiang2010-12-132-1/+23
| * Corrected documentation for QImage::fill().Kim Motoyoshi Kalland2010-12-131-2/+2
| * Fix transformed QPainter::drawGlyphs() for certain paint enginesEskil Abrahamsen Blomfeldt2010-12-131-6/+19
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-135-13/+17
|\ \
| * | Fix comctl32 v6 dependency generation in Visual Studio 2005 and higherminiak2010-12-133-9/+9
| * | support app-bundles with whitespace in nameOswald Buddenhagen2010-12-131-2/+6
| * | --warningsHarald Fernengel2010-12-131-2/+2
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-133-3/+64
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-113-3/+64
| |\ |/ /
| * QScript tests, sync the tests with the v8 branchOlivier Goffart2010-12-102-2/+63
| * We should not cache ICO files.Alexis Menard2010-12-101-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-1020-313/+217
|\ \
| * | Proposed fix for QTBUG-10499Christian.Ehrlicher2010-12-101-6/+6
| * | remove useless overloadKonstantin Ritt2010-12-101-2/+2
| * | simplify polling code a bitKonstantin Ritt2010-12-102-33/+8
| * | promote QNetworkConfigurationManager::updateConfigurations() to a slotKonstantin Ritt2010-12-101-1/+3
| * | simplify waitForOpened()Konstantin Ritt2010-12-101-9/+6
| * | fix CV-qualifiers for some membersKonstantin Ritt2010-12-102-13/+13
| * | minor clean-ups and styling fixesKonstantin Ritt2010-12-1019-250/+180
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-101-4/+4
|\ \
| * | Improving memory leak analysis for argv, envpmread2010-12-101-4/+4
| |/
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-10289-4096/+12384
|\ \ | |/ |/|
| * Fix compilation of qnetworkreply test with namespaces.Olivier Goffart2010-12-101-2/+2
| * QNetworkReply: set to finished for synchronous requestsPeter Hartmann2010-12-101-0/+1
| * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-10289-4096/+12383
| |\ |/ /
| * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-09289-4096/+12383
| |\
| | * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-08289-4096/+12383
| | |\
| | | * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-08289-4096/+12383
| | | |\
| | | | * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-07289-4096/+12383
| | | | |\
| | | | | * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-071-0/+3
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-061-0/+3
| | | | | | |\
| | | | | | | * Fix QTextEdit::selectAll crash from textChanged()Jiang Jiang2010-12-061-0/+3
| | | | | | |/
| | | | | * | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-07288-4096/+12380
| | | | | |\ \
| | | | | | * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-06288-4096/+12380
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-062-4/+15
| | | | | | | |\
| | | | | | | | * Fix proxy reading from gconf so that it is only done once / session.Jukka Rissanen2010-12-062-4/+15
| | | | | | | |/
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-035-28/+81
| | | | | | | |\
| | | | | | | | * rebuild configureOswald Buddenhagen2010-12-031-0/+0
| | | | | | | | * fix misleading uppercasing deprecation warningOswald Buddenhagen2010-12-031-3/+2
| | | | | | | | * Enable Phonon on Symbian by default.Oleh Vasyura2010-12-031-0/+3
| | | | | | | | * Disable OpenGL on Symbian only by default instead of alwaysOleh Vasyura2010-12-031-2/+4
| | | | | | | | * VFP type on ARM option in Linux configure scriptOleh Vasyura2010-12-031-2/+27
| | | | | | | | * Adding -dont-process option to Unix configure scriptOleh Vasyura2010-12-031-7/+20
| | | | | | | | * Synchronized configure.exe OpenGL options with Unix configureOleh Vasyura2010-12-031-2/+23
| | | | | | | | * build lrelease as part of the "libs" part.Oswald Buddenhagen2010-12-031-2/+2
| | | | | | | | * purge vestiges of imageformat-pluginsMark Brand2010-12-032-10/+0
| | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-032-12/+19
| | | | | | | |\ \ | | | | | | | | |/ | | | | | | | |/|
| | | | | | | | * Unify epocroot usage in createpackage and patch_capabilities scriptsMiikka Heikkinen2010-12-032-12/+19