Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-08 | 1 | -0/+1 |
|\ | |||||
| * | needs focus | Warwick Allison | 2010-04-08 | 1 | -0/+1 |
* | | Replace Text::wrap property with Text::wrapMode enumeration. | Martin Jones | 2010-04-08 | 5 | -8/+10 |
|/ | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-06 | 1 | -1/+1 |
|\ | |||||
| * | Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors | Johan Hauan | 2010-04-06 | 1 | -1/+1 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-06 | 1 | -0/+27 |
|\ \ | |/ |/| | |||||
| * | Labs (experimental) Gesture support. | Warwick Allison | 2010-04-06 | 1 | -0/+27 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-02 | 1 | -0/+3 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-01 | 1 | -0/+3 |
| |\ \ | |||||
| | * \ | Merge remote branch 'origin/4.7' into HEAD | Thiago Macieira | 2010-04-01 | 26 | -74/+81 |
| | |\ \ | | | |/ | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-01 | 1 | -0/+3 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-31 | 1 | -0/+3 |
| | | |\ \ | |||||
| | | | * \ | Merge commit 'origin/4.7' into symbian47 | Thomas Zander | 2010-03-31 | 7 | -328/+2 |
| | | | |\ \ | |||||
| | | | * | | | Work around bad naming of exported class in symbian sdk causing conflict | Thomas Zander | 2010-03-30 | 1 | -0/+3 |
* | | | | | | | Fix some more Q_PROPERTY followed by semi-colon | Thiago Macieira | 2010-04-02 | 5 | -8/+8 |
|/ / / / / / | |||||
* | | | | | | Merge remote branch 'origin/4.7' into HEAD | Thiago Macieira | 2010-04-01 | 29 | -93/+96 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-01 | 26 | -74/+81 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Make QML 'hello world' tutorial less confusing. | Yann Bodson | 2010-04-01 | 3 | -20/+19 |
| | * | | | | Doc improvements, fixes | Bea Lam | 2010-04-01 | 13 | -31/+31 |
| | * | | | | Fix imageprovider example compilation on Symbian arm | Joona Petrell | 2010-04-01 | 1 | -0/+4 |
| | * | | | | Fix plugin example compilation on Symbian arm | Joona Petrell | 2010-04-01 | 2 | -12/+13 |
| | * | | | | Renamed widgets example to proxywidgets to avoid conflicts | Joona Petrell | 2010-04-01 | 7 | -11/+14 |
| | |/ / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-31 | 3 | -19/+15 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 3 | -19/+15 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-03-30 | 425 | -1243/+16761 |
| | | |\ \ | |||||
| | | | * \ | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-03-30 | 1 | -1/+2 |
| | | | |\ \ | | | | | |/ | |||||
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 3 | -19/+15 |
| | | | |\ \ | |||||
| | | | | * \ | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-03-25 | 7 | -10/+36 |
| | | | | |\ \ | |||||
| | | | | * | | | Fix warnings and build on mingw | Thierry Bastian | 2010-03-25 | 3 | -19/+15 |
* | | | | | | | | Fix build on WinCE and Symbian: .pro file must match dir name. | Thiago Macieira | 2010-04-01 | 1 | -0/+0 |
* | | | | | | | | Fix compilation: no semi-colon after Q_ENUM or Q_PROPERTY | Thiago Macieira | 2010-04-01 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Minor cleanup. | Yann Bodson | 2010-03-31 | 2 | -6/+5 |
* | | | | | | | Improve flipable example. | Yann Bodson | 2010-03-31 | 7 | -32/+46 |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-31 | 5 | -27/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update examples/declarative.pro | Yann Bodson | 2010-03-31 | 1 | -1/+1 |
| * | | | | | | | Declarative examples cleanup. | Yann Bodson | 2010-03-31 | 3 | -25/+31 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-03-30 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-03-30 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-30 | 24 | -316/+472 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-29 | 2 | -1/+3 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | / | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | Changed pkg_prerules to not use default_deployment for vendor ID | Miikka Heikkinen | 2010-03-26 | 1 | -1/+2 |
* | | | | | | | example of WebView onAlert, and of popups in general. | Warwick Allison | 2010-03-31 | 2 | -0/+63 |
|/ / / / / / | |||||
* | | | | | | Move basic focusscope examples into auto tests. | Yann Bodson | 2010-03-30 | 6 | -327/+0 |
|/ / / / / | |||||
* | | | | | Change and rename qml EaseFollow to SmoothedAnimation | Leonardo Sobral Cunha | 2010-03-30 | 1 | -1/+2 |
| |_|/ / |/| | | | |||||
* | | | | Update examples/declarative.pro | Yann Bodson | 2010-03-29 | 2 | -2/+7 |
* | | | | Remove colorbrowser example | Yann Bodson | 2010-03-29 | 5 | -311/+0 |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-29 | 12 | -0/+381 |
|\ \ \ \ | |||||
| * | | | | Add focus and key navigation example. | Yann Bodson | 2010-03-29 | 8 | -0/+209 |
| * | | | | Add example on how to use Qt widgets in qml. | Yann Bodson | 2010-03-29 | 4 | -0/+172 |
* | | | | | Update for import dir and imageProvider changes. | Warwick Allison | 2010-03-29 | 2 | -3/+14 |
|/ / / / |