summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-086-591/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Rename textBeforeOffsetFromString to start with q.Frederik Gladhorn2011-07-081-6/+6
| * | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-071-0/+8
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Implement text interface for QLineEdit.Frederik Gladhorn2011-07-061-12/+28
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-122-9/+14
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-112-9/+14
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-112-9/+14
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Fixing WINSCW compile errormread2011-07-112-9/+14
* | | | | | | | | Merge remote branch 'mainline/4.8' into stagingJiang Jiang2011-07-0843-1222/+1354
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-071-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-061-0/+8
| | |\ \ \ \ \ | | | |/ / / / | | | | | / / | | | |_|/ / | | |/| | |
| | | * | | Fixes switching runtime graphics system when the maximized window is shown or...Stanislav Ionascu2011-07-051-0/+8
| | | |/ /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-07-0539-1211/+1315
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | QmlInspector: Some code cleanupsThorbjørn Lindeijer2011-06-237-51/+11
| | * | QmlInspector: Some cleanup in the Color Picker toolThorbjørn Lindeijer2011-06-232-44/+10
| | * | QmlInspector: Unified mouse and keyboard event handlingThorbjørn Lindeijer2011-06-2310-180/+320
| | * | QmlInspector: Removed private header postfix and Qt namespaceThorbjørn Lindeijer2011-06-2337-401/+302
| | * | QmlInspector: Share code between QGV/SG based QML debuggingThorbjørn Lindeijer2011-06-238-595/+732
| * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-022-4/+19
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-012-4/+19
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fix KERN-EXEC 0 errors in symbian bearer pluginShane Kearns2011-06-282-4/+19
| * | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-06-2929-154/+367
| |\ \ \ \ | | |/ / /