summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-236-69/+203
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-231-3/+32
| |\
| | * Improve performance of bilinear upscaling of images with neon.Samuel Rødal2010-12-221-3/+32
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-232-3/+7
| |\ \ | | |/ | |/|
| | * Fix crash in indeterminate progressbars on windowsJens Bache-Wiig2010-12-222-3/+6
| | * Fix timer regression for indeterminate progressbarsJens Bache-Wiig2010-12-221-0/+1
| * | Made documentation of QPixmap::createMaskFromColor match behaviour.Samuel Rødal2010-12-221-2/+2
| * | Improve performance of bilinear downscaling of images with neon.Samuel Rødal2010-12-221-26/+107
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-211-5/+12
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1410-16/+44
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-132-0/+10
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-105-150/+184
| | |\ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-096-6/+16
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-089-42/+81
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-071-0/+3
| | |\ \ \ \ \ \
| | * | | | | | | Doc: Added documentation about the use of null custom title bar widgets.David Boddie2010-12-071-5/+12
| * | | | | | | | Remove few compile warningsMiikka Heikkinen2010-12-201-2/+2
| * | | | | | | | Fix using QFileDialog statics in Symbian.Miikka Heikkinen2010-12-201-28/+41
* | | | | | | | | 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-2019-74/+106
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-2019-74/+106
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | / / / / / / / / | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | 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-152-14/+3
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1410-16/+44
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | 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-132-0/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | 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-105-150/+184
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | 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-091-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | QLabel wraps text at fixed lengthsSami Merila2010-12-092-7/+8
| | | * | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-089-42/+81
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | | 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