summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-217-653/+342
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-217-653/+342
| |\
| | *-. Merge branches 'nonQtApps-fix' and 'merge-request-2516' into master-s60axis2010-12-207-653/+342
| | |\ \
| | | | * get rid of QPrinterInfoPrivate::isNull memberKonstantin Ritt2010-12-202-3/+2
| | | | * QPrinterInfo::supportedPaperSizes(): return early if the info is invalidKonstantin Ritt2010-12-203-0/+7
| | | | * fix QPrinterInfo::defaultPrinter() on winKonstantin Ritt2010-12-201-9/+8
| | | | * micro-optimizations, clean-ups and styling fixesKonstantin Ritt2010-12-203-98/+83
| | | | * refactoring of QPrinterInfoKonstantin Ritt2010-12-207-363/+209
| | | | * minor refactoring of QPrinterInfoPrivateKonstantin Ritt2010-12-203-100/+32
| | | | * use binary search int the string2PaperSize() helperKonstantin Ritt2010-12-201-143/+64
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-211-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix the redirection of painting for the toolbar.Fabien Freling2010-12-201-4/+4
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-2049-157/+390
|\ \ \ \ \
| * \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-204-8/+24
| |\ \ \ \ \
| | * | | | | Setting TextInput.cursorPosition outside bounds crashed.Martin Jones2010-12-202-0/+4
| | * | | | | Don't truncate image:// url strings prematurelyBea Lam2010-12-202-8/+20
| * | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-2045-149/+366
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Quiet unused parameter warnings.Aaron McCarthy2010-12-201-0/+3
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-171-1/+2
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-12-178-35/+36
| | | |\ \ \ \
| | | * | | | | Fix waitForOpened not working with already active configurationVille Pernu2010-12-171-1/+2
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-174-1/+8
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-164-1/+8
| | | |\ \ \ \ \
| | | | * | | | | Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-164-1/+8
| | | | |/ / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-161-1/+4
| | |\ \ \ \ \ \
| | | * | | | | | QmlDebugger: Fix runtime warnings about unregistered metatypesKai Koehne2010-12-161-1/+4
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-161-2/+4
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Avoid duplicate resize eventMiikka Heikkinen2010-12-161-2/+4
| | | |/ / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-166-32/+28
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-157-32/+116
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1423-54/+139
| | | |\ \ \ \ \
| | | * | | | | | Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64fJan-Arve Sæther2010-12-141-1/+1
| | | * | | | | | Make sure that d->init() is called from both ctors.Jan-Arve Sæther2010-12-141-1/+2
| | | * | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1317-78/+181
| | | |\ \ \ \ \ \
| | | * | | | | | | Fixes text jitter in QtQuick components when using the virtual keyboardGabriel de Dietrich2010-12-131-1/+1
| | | * | | | | | | Symbian specific input methods should use 'Text' mode as default caseSami Merila2010-12-131-1/+1
| | | * | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-109-162/+214
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Fix whitespace in qs60style.cppSami Merila2010-12-101-1/+1
| | | * | | | | | | | QDateTimeEdit is not showing correctly when resizes in symbianSami Merila2010-12-101-22/+16
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-092-3/+2
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | QLabel wraps text at fixed lengthsSami Merila2010-12-092-7/+8
| | | * | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0817-70/+139
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-162-10/+25
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Improve performance of clipping to a scaled QRectFLars Knoll2010-12-152-10/+25
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-153-13/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Suppress a warning about killing a timer that isn't active.Thiago Macieira2010-12-151-0/+2
| | | * | | | | | | | | | | Add a warning about trying to release a timer ID that isn't activeThiago Macieira2010-12-151-0/+1
| | | * | | | | | | | | | | Don't need to set FD_CLOEXEC since qt_safe_* will have done that.Thiago Macieira2010-12-151-13/+0
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-151-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-151-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |