summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-232-0/+4
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-182-1/+3
| |\
| * | MOBILITY -404 / 507Wolfgang Beck2010-02-162-0/+4
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-192-1/+3
|\ \ \ | | |/ | |/|
| * | Added a new flag to fine-tune gesture propagation policyDenis Dzyubenko2010-02-171-1/+2
| * | doc: Fixed some qdoc errors.Martin Smith2010-02-161-0/+1
| |/
| * Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-3/+3
| |\
| * \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-122-5/+0
| |\ \
* | \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-163-9/+23
|\ \ \ \
| * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-163-8/+3
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | doc: Fixed several typos.Martin Smith2010-02-121-3/+3
| | |/
| * | Added new mouse cursor types.Denis Dzyubenko2010-02-052-1/+13
| * | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-042-2/+16
| |\ \
| * | | Add the ability for the SunStudio 8+ compilers to doDarin Broady2010-01-221-2/+3
| * | | Merge branch '4.6'Thiago Macieira2010-01-181-0/+4
| |\ \ \
| * \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1320-51/+64
| |\ \ \ \
| * \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-122-1/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-081-4/+27
| |\ \ \ \ \ \
| * | | | | | | Qt 5 comment added for QT_WA / QT_WA_INLINE removalJoerg Bornemann2010-01-061-0/+1
| * | | | | | | Our variables are our variables so we prefix them.Alexis Menard2010-01-061-1/+1
| * | | | | | | Revert "remove obsolete QT_WA/QT_WA_INLINE macros"Joerg Bornemann2009-12-231-0/+3
| * | | | | | | remove obsolete QT_WA/QT_WA_INLINE macrosminiak2009-12-221-3/+0
| * | | | | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-13/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-11-256-43/+47
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-11-132-2/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-11-1010-239/+575
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-292-0/+21
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6'Thiago Macieira2009-10-264-7/+28
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-211-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-163-8/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-102-8/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-083-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-063-8/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-053-21/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-09-302-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-09-296-31/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-09-181-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-09-175-6/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-09-142-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-09-121-21/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Jason McDonald2009-09-0920-82/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-09-042-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-09-034-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-09-011-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long live Qt 4.7Thiago Macieira2009-09-011-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-124-7/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to export qBadAlloc() on all platformsHarald Fernengel2010-02-112-5/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | S60 softkey refactoring (support for merging, priorities and menus)Janne Anttila2010-02-032-2/+16
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2120-58/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump version to 4.6.2.Jason McDonald2010-01-191-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |