Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-08-31 | 1 | -1/+3 |
|\ | |||||
| * | Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds. | Miikka Heikkinen | 2011-08-24 | 1 | -1/+3 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-08-31 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'upstream/4.8' | Sergio Ahumada | 2011-08-29 | 11 | -59/+274 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-08-26 | 6 | -12/+33 |
| |\ \ \ | |||||
| * | | | | directfb: Include directfbgl.h directly | Holger Hans Peter Freyther | 2011-08-12 | 1 | -1/+1 |
* | | | | | Merge remote-tracking branch 'review/master' | Sergio Ahumada | 2011-08-29 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Do not unconditionally use pkg-config in .pro files | Rohan McGovern | 2011-08-26 | 1 | -1/+1 |
* | | | | | uikit: get rid of the "min 30fps" for event handling. | Eike Ziller | 2011-08-25 | 1 | -9/+2 |
* | | | | | uikit: update README | Eike Ziller | 2011-08-25 | 1 | -5/+14 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-08-24 | 9 | -45/+258 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | uikit: fix examples to no longer ship the custom fonts | Eike Ziller | 2011-08-24 | 2 | -12/+0 |
| * | | | | Use CoreText for font rendering on uikit. | Eike Ziller | 2011-08-24 | 9 | -33/+258 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-08-24 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | uikit: Use correct pixmap data format. | Eike Ziller | 2011-08-19 | 1 | -1/+1 |
* | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-08-19 | 2 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-08-18 | 2 | -3/+3 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Fix non-ascii name issues in ICD. | Xizhi Zhu | 2011-08-18 | 2 | -3/+3 |
* | | | | uikit: Fixes for Open GL ES 1 and for pre-3GS devices | Eike Ziller | 2011-08-17 | 1 | -5/+26 |
* | | | | uikit: Fix warning. | Eike Ziller | 2011-08-17 | 1 | -1/+1 |
* | | | | Use thumb instructions for uikit | Eike Ziller | 2011-08-17 | 1 | -2/+1 |
* | | | | Update uikit README: svg works, warn about thumb | Eike Ziller | 2011-08-17 | 1 | -3/+4 |
|/ / / | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-08-12 | 28 | -136/+7 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch 'master' of ../qt-qml-staging | Michael Brasser | 2011-08-11 | 95 | -1401/+4139 |
| |\ \ | |||||
| * | | | QmlInspector: Fix moc error | Kai Koehne | 2011-08-11 | 1 | -1/+0 |
| * | | | QmlInspector: Fix compile for QT_NO_CURSOR | Kai Koehne | 2011-08-10 | 3 | -0/+6 |
| * | | | QmlInspector: Remove unused toolbar | Kai Koehne | 2011-08-10 | 25 | -135/+1 |
* | | | | uikit: Use release Qt for simulator, update README | Eike Ziller | 2011-08-05 | 3 | -83/+103 |
* | | | | Automatic closing of input panel on uikit when QML item looses focus. | Eike Ziller | 2011-08-05 | 3 | -6/+65 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-08-01 | 15 | -29/+1464 |
|\ \ \ | |||||
| * | | | Remove debug output. | Eike Ziller | 2011-07-26 | 1 | -1/+0 |
| * | | | Add some sound support to the uikit platform. | Eike Ziller | 2011-07-25 | 10 | -29/+827 |
| * | | | Add flickrdemo uikit example project. | Eike Ziller | 2011-07-25 | 5 | -0/+638 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-07-22 | 5 | -15/+1389 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Style cleanup - space after flow control keywords. | Frederik Gladhorn | 2011-07-13 | 1 | -3/+3 |
| * | | | Add IAccessible2 table2 implementation. | Frederik Gladhorn | 2011-07-13 | 4 | -10/+1382 |
| * | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-07-12 | 2 | -46/+51 |
| |\ \ \ | |||||
| * | | | | Use name for combobox on Unix. | Frederik Gladhorn | 2011-07-12 | 1 | -5/+7 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-07-21 | 8 | -19/+157 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote branch 'review/master' into staging | Jiang Jiang | 2011-07-20 | 8 | -19/+157 |
| |\ \ \ \ \ | |||||
| | * | | | | | Support interface orientation for uikit. | Eike Ziller | 2011-07-18 | 7 | -19/+155 |
| | * | | | | | Properly quit the input event thread in the directfb platform plugin. | Samuel Rødal | 2011-07-14 | 1 | -0/+2 |
| | * | | | | | Merge remote branch 'mainline/4.8' | Jiang Jiang | 2011-07-07 | 42 | -1222/+1346 |
| | |\ \ \ \ \ | |||||
* | | \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-20 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-18 | 1 | -1/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Prevent failed rendering for NPOT textures in GLES2. | Samuel Rødal | 2011-07-18 | 1 | -1/+3 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-07-12 | 2 | -37/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixing WINSCW compile error | mread | 2011-07-05 | 2 | -9/+14 |
| * | | | | | | | | whitespace fixes | mread | 2011-07-05 | 2 | -37/+37 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-07-12 | 1 | -12/+28 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | |