Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.8' into 4.8-from-4.7 | Rohan McGovern | 2011-05-20 | 258 | -4397/+4399 |
|\ | |||||
| * | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-19 | 1 | -1/+3 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-05-18 | 1 | -1/+3 |
| | |\ | |||||
| | | * | Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII... | Simon Hausmann | 2011-05-16 | 1 | -1/+3 |
| * | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 3 | -4/+20 |
| |\ \ \ | | |/ / | |||||
| * | | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 458 | -7827/+7827 |
| | |/ | |/| | |||||
* | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7 | Rohan McGovern | 2011-05-17 | 201 | -3433/+3433 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-17 | 198 | -3380/+3380 |
| |\ \ | |||||
| | * | | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 198 | -3380/+3380 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-05-16 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Fixed bug in meego graphics system runtime switching. | Samuel Rødal | 2011-05-16 | 1 | -2/+2 |
* | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-16 | 80 | -24/+6857 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-05-12 | 65 | -5/+6490 |
| |\ \ \ \ | |||||
| | * | | | | QmlDebug: Fix QmlOstPlugin compilation failure | Kai Koehne | 2011-05-12 | 1 | -2/+2 |
| | * | | | | QmlDebug: Fix QmlOstPlugin compilation failure | Tom Sutcliffe | 2011-05-11 | 4 | -2/+51 |
| | * | | | | Merge remote branch 'qt/4.8' into master-qml-staging | Kai Koehne | 2011-05-10 | 139 | -1341/+6255 |
| | |\ \ \ \ | |||||
| | * | | | | | Enable performance monitoring at application startup. | Kai Koehne | 2011-05-10 | 2 | -1/+14 |
| | * | | | | | Fixed license header | Thorbjørn Lindeijer | 2011-05-05 | 1 | -8/+16 |
| | * | | | | | Fixed compile on Windows | Thorbjørn Lindeijer | 2011-05-04 | 1 | -1/+1 |
| | * | | | | | Moved the QML Observer Service and related functionality into Qt | Thorbjørn Lindeijer | 2011-05-04 | 61 | -2/+6417 |
| * | | | | | | Remove not supported qmake api | Jørgen Lind | 2011-05-09 | 3 | -6/+0 |
| * | | | | | | Added Wayland selection support. | Laszlo Agocs | 2011-05-09 | 5 | -0/+334 |
| * | | | | | | Added Wayland selection support. | Laszlo Agocs | 2011-05-09 | 6 | -3/+24 |
| * | | | | | | Add the wayland client libraries to rpath if we use rpath | Jørgen Lind | 2011-05-09 | 1 | -0/+4 |
| * | | | | | | Fix the wayland windowsurface so that we have stencil and depth buffer | Jørgen Lind | 2011-05-09 | 1 | -1/+1 |
| * | | | | | | Dont do doneCurrent in swapBuffers | Jørgen Lind | 2011-05-05 | 1 | -1/+0 |
| * | | | | | | Lighthouse: Fix up Xlib | Jørgen Lind | 2011-05-05 | 5 | -14/+10 |
| * | | | | | | Merge remote-tracking branch 'origin/4.8' into lighthouse-master | Jørgen Lind | 2011-05-04 | 3 | -21/+35 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-11 | 3 | -4/+20 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-10 | 2 | -2/+18 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Introduce platform extension to QGraphicsSystem | Jani Hautakangas | 2011-05-10 | 2 | -2/+18 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Fix -no-gui | Bernhard Rosenkraenzer | 2011-05-09 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2011-05-04 | 25 | -123/+310 |
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | |||||
| * | | | Remove warnings | Jørgen Lind | 2011-05-03 | 1 | -0/+1 |
| * | | | Fix Wayland plugin so it works with the wayland bind api | Jørgen Lind | 2011-05-03 | 5 | -50/+26 |
| * | | | wayland: Track wayland changes | Kristian Høgsberg | 2011-04-28 | 5 | -21/+12 |
| * | | | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-04-28 | 14 | -164/+868 |
| |\ \ \ | |||||
| * | | | | Support GL ES 2 with uikit. | con | 2011-04-27 | 6 | -43/+101 |
| * | | | | Added missing function in QWaylandWindow. | Samuel Rødal | 2011-04-19 | 1 | -0/+3 |
| * | | | | wayland: Drop a debug qWarning() | Kristian Høgsberg | 2011-04-19 | 1 | -3/+0 |
| * | | | | wayland: Discard motion and button events receive with a NULL pointer focus | Kristian Høgsberg | 2011-04-19 | 1 | -0/+18 |
| * | | | | wayland: Include eglconvenience.pri instead of pulling in individual file | Kristian Høgsberg | 2011-04-19 | 1 | -5/+4 |
| * | | | | wayland: Remove unused EGLConfig field | Kristian Høgsberg | 2011-04-19 | 1 | -1/+0 |
| * | | | | wayland: Add native access interface for Wayland plugin | Kristian Høgsberg | 2011-04-19 | 5 | -0/+144 |
| * | | | | Fixes compilation of wayland plugin after latest changes in wayland. | Samuel Rødal | 2011-04-18 | 1 | -0/+1 |
* | | | | | Merge branch '4.8-upstream' | Thierry Bastian | 2011-04-28 | 14 | -164/+868 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-04-21 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-20 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Fix Symbian/Linux compilation breakage in plugins/qmltooling | Kai Koehne | 2011-04-20 | 1 | -1/+1 |
| * | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-20 | 11 | -8/+706 |
| |\ \ \ \ \ |