summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-09-275-6/+7
|\
| * Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-223-10/+117
| |\
| * | Allow shared EGL contexts for xcb and xlib platformsReuben Dowle2011-09-192-2/+2
| * | Allow generic EGL platform contexts to be sharedReuben Dowle2011-09-192-3/+4
| * | stop tslib plugin having same file name as linux input pluginReuben Dowle2011-09-191-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-09-265-1/+149
|\ \ \
| * | | Added correct licence headers to symsql source filesTimo Kauppinen2011-09-211-18/+18
| * | | Added SQL driver plugin implementation for Symbian.Timo Kauppinen2011-09-212-0/+94
| * | | symbian: Implement QNetworkConfiguration::purpose()Shane Kearns2011-09-202-1/+52
| * | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-204-17/+91
| |\ \ \
| * | | | symbian bearer: fix tst_qnetworksession test failuresShane Kearns2011-09-191-0/+3
* | | | | Fix accessible menu not returning child name.Frederik Gladhorn2011-09-231-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-09-201-2/+34
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | More accurately determine bearer type for symbian GPRS/3GShane Kearns2011-09-131-2/+34
| * | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-3113-61/+276
| |\ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-08-251-1/+3
| |\ \ \
* | \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-09-161-2/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-14368-702/+46240
| |\ \ \ \
| * | | | | Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdkOswald Buddenhagen2011-09-051-1/+1
| * | | | | remove obsolete defineOswald Buddenhagen2011-09-051-1/+0
* | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-091-7/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-081-7/+7
| |\ \ \ \ \
| | * | | | | Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-071-7/+7
* | | | | | | Implement QAccessibleActionInterface for menu actions.Frederik Gladhorn2011-09-082-8/+83
|/ / / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-08-311-1/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.Miikka Heikkinen2011-08-241-1/+3
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-08-311-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-2911-59/+274
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-266-12/+33
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | directfb: Include directfbgl.h directlyHolger Hans Peter Freyther2011-08-121-1/+1
* | | | | | Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-291-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Do not unconditionally use pkg-config in .pro filesRohan McGovern2011-08-261-1/+1
* | | | | | uikit: get rid of the "min 30fps" for event handling.Eike Ziller2011-08-251-9/+2
* | | | | | uikit: update READMEEike Ziller2011-08-251-5/+14
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-249-45/+258
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | uikit: fix examples to no longer ship the custom fontsEike Ziller2011-08-242-12/+0
| * | | | | Use CoreText for font rendering on uikit.Eike Ziller2011-08-249-33/+258
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-241-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | uikit: Use correct pixmap data format.Eike Ziller2011-08-191-1/+1
* | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-192-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-182-3/+3
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Fix non-ascii name issues in ICD.Xizhi Zhu2011-08-182-3/+3
* | | | uikit: Fixes for Open GL ES 1 and for pre-3GS devicesEike Ziller2011-08-171-5/+26
* | | | uikit: Fix warning.Eike Ziller2011-08-171-1/+1
* | | | Use thumb instructions for uikitEike Ziller2011-08-171-2/+1
* | | | Update uikit README: svg works, warn about thumbEike Ziller2011-08-171-3/+4
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-1228-136/+7
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1195-1401/+4139
| |\ \
| * | | QmlInspector: Fix moc errorKai Koehne2011-08-111-1/+0
| * | | QmlInspector: Fix compile for QT_NO_CURSORKai Koehne2011-08-103-0/+6