summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-217-4/+56
|\
| * adding new entries to qt::key enumAdam Wasila2010-04-161-0/+2
| * adding new entries to qt::key enumAdam Wasila2010-04-161-0/+2
| * Introduce a qconfig feature for Bearer ManagementTasuku Suzuki2010-04-152-0/+13
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-132-0/+14
| |\
| | * Introduce a qconfig feature for QtDBusTasuku Suzuki2010-04-082-0/+14
| * | Enable setting the imports directory via qt.confKai Koehne2010-04-081-0/+4
| |/
| * Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-252-1/+3
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-222-1/+3
| | |\
| | | * Add MiddleButton = MidButton to MouseButtons enum.Martin Jones2010-03-222-1/+3
| * | | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-241-1/+1
| * | | Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets (part 2).Robert Griebl2010-03-221-0/+4
| * | | Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets.Robert Griebl2010-03-221-0/+3
| |/ /
| * | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-3/+6
| |\ \ | | |/ | |/|
| | * Change fromSymbianRSgImage() to use the newer version of RSgImageJason Barron2010-03-191-3/+6
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-151-0/+10
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-112-18/+46
| |\ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-013-4/+12
| |\ \ \ \
| * \ \ \ \ 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/qt-s60-public into merge-w...axis2010-02-192-1/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-124-7/+16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2120-58/+104
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-188-60/+78
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-0610-237/+593
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added std headers to fix Symbian build error.axis2009-10-231-0/+5
* | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-181-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | make it possible to use sse2 with mingwThierry Bastian2010-03-111-0/+10
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-112-18/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | doc: Fixed several qdoc errors.Martin Smith2010-03-091-1/+1
| * | | | | | | | | | | | Added two missing keys for X11Denis Dzyubenko2010-03-082-0/+5
| * | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-18/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fixed key mappings on X11Denis Dzyubenko2010-03-051-17/+17
| | * | | | | | | | | | | Added fullscreen support to softkeys in Symbian.Janne Anttila2010-03-012-1/+11
| * | | | | | | | | | | | Added a documentation for the new enum value in gesture api.Denis Dzyubenko2010-03-041-0/+5
| * | | | | | | | | | | | Block the Maemo5 window attribute values from being assigned to something els...Robert Griebl2010-03-031-0/+8
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-017-19/+42
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-261-2/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-261-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Always define Q_WS_S60 on Symbian unless configured with -no-s60.Jason Barron2010-02-231-1/+1
| | | * | | | | | | | | | Enable window size caching on Symbian NGA variants.Jason Barron2010-02-231-0/+1
| | | * | | | | | | | | | Use the SYMBIAN_BUILD_GCE macro to check if the GCE variant can be usedJason Barron2010-02-231-1/+1
| | | * | | | | | | | | | Bump version to 4.6.3.Jason McDonald2010-02-151-2/+2
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-252-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-242-1/+8
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Fix build on Mac OS XGabriel de Dietrich2010-02-221-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-182-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