summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | QmlInspector: Remove unused toolbarKai Koehne2011-08-1025-135/+1
* | | | uikit: Use release Qt for simulator, update READMEEike Ziller2011-08-053-83/+103
* | | | Automatic closing of input panel on uikit when QML item looses focus.Eike Ziller2011-08-053-6/+65
| |/ / |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-0115-29/+1464
|\ \ \
| * | | Remove debug output.Eike Ziller2011-07-261-1/+0
| * | | Add some sound support to the uikit platform.Eike Ziller2011-07-2510-29/+827
| * | | Add flickrdemo uikit example project.Eike Ziller2011-07-255-0/+638
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-07-225-15/+1389
|\ \ \ \ | |/ / / |/| | |
| * | | Style cleanup - space after flow control keywords.Frederik Gladhorn2011-07-131-3/+3
| * | | Add IAccessible2 table2 implementation.Frederik Gladhorn2011-07-134-10/+1382
| * | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-122-46/+51
| |\ \ \
| * | | | Use name for combobox on Unix.Frederik Gladhorn2011-07-121-5/+7
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-218-19/+157
|\ \ \ \ \
| * \ \ \ \ Merge remote branch 'review/master' into stagingJiang Jiang2011-07-208-19/+157
| |\ \ \ \ \
| | * | | | | Support interface orientation for uikit.Eike Ziller2011-07-187-19/+155
| | * | | | | Properly quit the input event thread in the directfb platform plugin.Samuel Rødal2011-07-141-0/+2
| | * | | | | Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-0742-1222/+1346
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-201-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-181-1/+3
| |\ \ \ \ \ \
| | * | | | | | Prevent failed rendering for NPOT textures in GLES2.Samuel Rødal2011-07-181-1/+3
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-07-122-37/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing WINSCW compile errormread2011-07-052-9/+14
| * | | | | | | | whitespace fixesmread2011-07-052-37/+37
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-07-121-12/+28
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |