summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-graphics-team-text-master'Eskil Abrahamsen Blomfeldt2011-01-1014-26/+238
|\
| * 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-201-0/+1
* | 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-244-11/+98
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-244-11/+98
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-244-11/+98
| | |\ \ \
| | | * | | Prevented infinite loop in QMoviePrivate::next().Samuel Rødal2010-12-221-1/+5
| | | * | | Added int overloads to QPoint operator* and operator*=.Samuel Rødal2010-12-222-9/+92
| | | * | | 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-243-42/+104
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-231-6/+18
| |\ \ \ \ \
| | * | | | | Fix fullscreen/Maximized dialog misplacement in SymbianMiikka Heikkinen2010-12-231-6/+18
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-232-36/+86
| |\ \ \ \ \ \
| | * | | | | | Add Postgresql 8.x and 9 supportsCharles Yin2010-12-232-36/+86
| | |/ / / / /
* | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-2410-20/+83
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-2310-20/+83
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-2310-20/+83
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | WorkerScript could starve image loading of CPU.Martin Jones2010-12-231-1/+1
| | | * | | | | More docs for FolderListModelMartin Jones2010-12-231-0/+33
| | | * | | | | Improve docs on attached properties on view delegates.Martin Jones2010-12-233-0/+25
| | | * | | | | Models which load incrementally via fetchMore() don't work.Martin Jones2010-12-231-0/+6
| | | * | | | | Ensure PathView doesn't jump when starting to drag.Martin Jones2010-12-231-1/+3
| | | * | | | | Nested flickables would react alternately to flicks.Martin Jones2010-12-231-2/+4
| | | * | | | | Improve QDeclarativeComponent test coverage.Michael Brasser2010-12-222-12/+0
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-222-4/+11
| | | |\ \ \ \ \
| | | | * | | | | Removing all visible items in ListView resulted in blank view.Martin Jones2010-12-221-4/+10
| | | | * | | | | XmlListModel requests should set 'Accept' header to 'application/xml'Bea Lam2010-12-221-0/+1
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-2427-317/+1209
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | add missing license headerHarald Fernengel2010-12-221-0/+41
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-2227-317/+1168
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-2127-317/+1168
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Add inter-process binary shader cache for MeeGoHarald Fernengel2010-12-216-137/+771
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-2021-180/+397
| | | |\ \ \ \ \ \
| | | | * | | | | | Track average wait times under our maximum spin time thresholdBradley T. Hughes2010-12-204-8/+21
| | | | * | | | | | Store and track spin times in nanosecond resolutionBradley T. Hughes2010-12-202-7/+8
| | | | * | | | | | Optimize adaptive spinning mutex codeBradley T. Hughes2010-12-204-19/+25
| | | | * | | | | | Improve QMutex contention performance on LinuxBradley T. Hughes2010-12-202-6/+39
| | | | * | | | | | Improve QMutex contention performance on Mac OS XBradley T. Hughes2010-12-202-2/+59
| | | | * | | | | | Disable spinning under lock contention on single CPU machinesBradley T. Hughes2010-12-201-0/+10
| | | | * | | | | | Remove unnecessary testAndSetAcquire from QMutex::lockInternal()Bradley T. Hughes2010-12-201-9/+6
| | | | * | | | | | Move contender count maintenance to QMutexPrivateBradley T. Hughes2010-12-203-35/+21
| | | | * | | | | | Removed QMutexPrivate::self() declarationBradley T. Hughes2010-12-201-1/+0