summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-121-1/+5
|\
| * Mac: pixmaps dont treat alpha exactly the same as other platformsRichard Moe Gustavsen2011-01-121-1/+5
* | 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-1111-12/+190
|\ \ | |/ |/|
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1111-12/+190
| |\
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2011-01-106-12/+19
| | |\
| | * \ Merge branch 'qt-graphics-team-text-master'Eskil Abrahamsen Blomfeldt2011-01-1011-12/+190
| | |\ \
| | | * | 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-213-4/+16
* | | | | use qBinaryFind instead of bsearchKonstantin Ritt2011-01-112-53/+15
* | | | | fix 'QChar::QChar(char)' is deprecatedKonstantin Ritt2011-01-111-1/+1
|/ / / /
* | | | qt project files: create pkg-config files for mingwMark Brand2011-01-101-1/+1
| |_|/ |/| |
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-072-10/+9
|\ \ \
| * | | Fixed bug and performance problem in windowsstyle.Samuel Rødal2011-01-071-2/+2
| * | | qkeymapper_x11.cpp: fix compilation with LSB and without XKBOlivier Goffart2011-01-061-8/+7
* | | | Cocoa: add support for QEventLoop::ExcludeUserInputEventsRichard Moe Gustavsen2011-01-061-1/+4
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-051-1/+2
|\ \ \ \ | |/ / /
| * | | Fixed first element being a LineToElement in QPainterPath::connectPath()Samuel Rødal2011-01-041-1/+2
* | | | Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)Prasanth Ullattil2011-01-041-0/+2
* | | | Set no brush when the brush is a solid patern transparent color.Pierre Rossi2011-01-041-0/+2
| |/ / |/| |
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-301-0/+8
|\ \ \ | |/ /
| * | Clear WSERV content when a native child receives an "expose"Jason Barron2010-12-291-0/+8
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-242-2/+6
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-242-2/+6
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-242-2/+6
| | |\ \ \
| | | * | | Prevented infinite loop in QMoviePrivate::next().Samuel Rødal2010-12-221-1/+5
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-211-1/+1
| | | |\ \ \
| | | | * | | QMessageBox wrong Show/Hide Details button labelRaul Metsma2010-12-211-1/+1
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-241-6/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Fix fullscreen/Maximized dialog misplacement in SymbianMiikka Heikkinen2010-12-231-6/+18
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-241-22/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-221-22/+15
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-211-22/+15
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-201-22/+15
| | | |\ \ \
| | | | * | | Make the QRasterPaintEngineState copy constructor cheaper.Andreas Kling2010-12-201-21/+13
| | | | * | | Micro-optimization for QSpanData::setup()Andreas Kling2010-12-201-1/+2
| | | | * | | Make parent constructor argument optionalJoão Abecasis2010-12-161-1/+1
* | | | | | | 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
| | |\ \ \ \ \