summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
Commit message (Expand)AuthorAgeFilesLines
* Make S60 integration optional.Jason Barron2009-07-153-11/+20
* Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-092-3/+5
|\
| * Merge branch 'warningRemovals'axis2009-07-062-1/+3
| |\
| | * Removed unused static data in Symbian and others.axis2009-07-061-0/+2
| | * Proper Q_UNUSED() macro for RVCT.axis2009-07-061-1/+1
| * | Rectified simple typo.Aleksandar Sasha Babic2009-07-061-1/+1
| |/
| * Merge branch 'warningRemovals'axis2009-06-301-1/+1
| |\
| | * Fixed a warning on Symbian.axis2009-06-301-1/+1
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2919-44/+52
| |\ \ | | |/ | |/|
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3019-43/+150
|\ \ \
| * \ \ Merge branch '4.5'Thiago Macieira2009-06-282-5/+9
| |\ \ \ | | | |/ | | |/|
| | * | Fix detection of the ELF interpreter on Linux.Thiago Macieira2009-06-282-5/+9
| | * | Bump Qt version number.Jason McDonald2009-06-251-2/+2
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-1/+30
| |\ \ \
| | * | | Add some macro expressions to qglobal.h for typeof, alignof and aligned().Thiago Macieira2009-06-261-1/+30
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-241-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-231-0/+4
| | |\ \ \ | | | |/ /
| | | * | Add an error message for building architecture mismatchNorwegian Rock Cat2009-06-231-0/+4
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-231-0/+12
| |\ \ \ \ | | |/ / /
| | * | | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+12
| * | | | Multitouch, Cocoa: Added Qt::WA_TouchPadAcceptSingleTouchEventsRichard Moe Gustavsen2009-06-221-0/+1
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-221-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Changed enum Qt::Uninitialized to enum Qt::InitializationMartin Smith2009-06-191-1/+1
| | * | | Make construction of unitialized QTransform/QMatrix a no-op.Bjørn Erik Nilsen2009-06-181-0/+4
| * | | | Change behavior of how touch and mouse events work togetherBradley T. Hughes2009-06-181-1/+4
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-1718-37/+37
| |\ \ \ \ | | |/ / /
| | * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-1618-37/+37
| | |\ \ \ | | | |/ /
| | | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-1618-37/+37
| * | | | rename Qt::WA_AcceptedTouchBeginEvent to Qt::WA_WState_AcceptedTouchBeginEventBradley T. Hughes2009-06-111-1/+1
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-082-0/+4
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-052-0/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-293-21/+47
| |\ \ \ \ \
| * | | | | | Make Qt::TouchPointState ORable, add Q*TouchEvent::touchPointStates()Bradley T. Hughes2009-05-271-4/+6
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-262-2/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-121-0/+1
| |\ \ \ \ \ \ \
| * | | | | | | | Added Qt::GestureUpdated state for the gesture.Denis Dzyubenko2009-05-111-2/+4
| * | | | | | | | Extended the gesture documentation.Denis Dzyubenko2009-05-111-0/+17
| * | | | | | | | Modifications after the api review by Brad.Denis Dzyubenko2009-05-111-7/+11
| * | | | | | | | Merge of the maemo-gestures branch onto qt/4.5.0Denis Dzyubenko2009-05-111-0/+15
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-05-042-90/+18
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-292-1/+12
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use a widget attribute to keep track of whether or not TouchBegin has been ac...Bradley T. Hughes2009-04-291-0/+1
| * | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-232-13/+13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-201-11/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-162-3/+19
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-072-17/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add QSysInfo::WV_WINDOWS7Bradley T. Hughes2009-03-312-1/+10
| * | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-03-311-61/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-03-253-20/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add QTouchEvent and QGraphicsSceneTouchEventBradley T. Hughes2009-03-241-0/+7