Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'main/4.7' into 4.7 | Morten Johan Sørvig | 2010-03-25 | 24 | -158/+246 |
|\ | |||||
| * | Qt.Infinite -> Animation.Infinite | Michael Brasser | 2010-03-25 | 3 | -3/+3 |
| * | Replace Animation's repeat property with loops. | Michael Brasser | 2010-03-25 | 3 | -5/+5 |
| * | Minehunt readme was missing a step. | Alan Alpert | 2010-03-23 | 1 | -0/+2 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-03-23 | 10 | -37/+121 |
| |\ | |||||
| | * | Usability improvements for photoviewer demo. | Yann Bodson | 2010-03-23 | 5 | -8/+32 |
| | * | Remove ParentAction. | Michael Brasser | 2010-03-23 | 2 | -8/+12 |
| | * | Editable tag in photoviewer demo. | Yann Bodson | 2010-03-23 | 4 | -15/+61 |
| | * | Small photoviewer improvements | Yann Bodson | 2010-03-23 | 3 | -5/+13 |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-22 | 14 | -119/+101 |
| | |\ | |||||
| * | | | Use QDeclarativeListProperty properly | Alan Alpert | 2010-03-23 | 1 | -1/+23 |
| | |/ | |/| | |||||
| * | | Deprecate inline Script {} blocks | Aaron Kennedy | 2010-03-22 | 14 | -119/+101 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-22 | 1 | -9/+9 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-19 | 1 | -9/+9 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge remote branch 'origin/4.7' into oslo-staging-1 | Aaron McCarthy | 2010-03-19 | 13 | -88/+122 |
| | |\ | |||||
| | * | | Remove incorrect semi-colons after Q_PROPERTY | Thiago Macieira | 2010-03-18 | 1 | -9/+9 |
* | | | | Merge branch '4.6-s60' into 4.7-s60 | axis | 2010-03-22 | 1 | -4/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Useful support for -qtlibinfix configure parameter in Symbian | Miikka Heikkinen | 2010-03-18 | 1 | -4/+6 |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Martin Jones | 2010-03-19 | 13 | -88/+122 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60 | axis | 2010-03-18 | 5 | -3/+16 |
| |\ \ \ | | |/ / | |||||
| | * | | Added close button to Anomaly demo browser | Miikka Heikkinen | 2010-03-16 | 5 | -3/+16 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60 | axis | 2010-03-16 | 4 | -4/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Fix build break caused by undefined symbol SetDialogPreference | Miikka Heikkinen | 2010-03-11 | 4 | -4/+4 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-11 | 79 | -208/+203 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-01 | 22 | -114/+121 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-23 | 47 | -79/+1341 |
| |\ \ \ \ \ | |||||
| * | | | | | | Changed fluidlauncher deployment to cope with Symbian makefile system | axis | 2010-02-23 | 1 | -77/+93 |
| * | | | | | | Implemented recursive "sis" target and enabled sis_targets feature. | axis | 2010-02-23 | 2 | -1/+6 |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-16 | 149 | -3/+4886 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-16 | 3 | -6/+13 |
| | |\ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | axis | 2010-02-12 | 4 | -6/+15 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | use the proper QMake option to find a shared header file | Thomas Zander | 2010-02-04 | 4 | -4/+4 |
| * | | | | | | | | | Fix linking for armlink | Thomas Zander | 2010-02-04 | 1 | -3/+3 |
* | | | | | | | | | | Add/delete albums in photoviewer. | Yann Bodson | 2010-03-17 | 5 | -24/+95 |
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-15 | 22 | -25/+398 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Import "content" with as qualifier to support network without qmldir | mae | 2010-03-15 | 1 | -5/+5 |
| * | | | | | | | | | Small fixes to photoviewer demo | Yann Bodson | 2010-03-15 | 2 | -12/+14 |
| * | | | | | | | | | Add busy indicator to photoviewer demo | Yann Bodson | 2010-03-15 | 5 | -2/+18 |
| * | | | | | | | | | Add new declarative photoviewer demo | Yann Bodson | 2010-03-12 | 12 | -0/+354 |
| * | | | | | | | | | Replace QDeclarativeContext::addDefaultObject() -> setContextObject() | Aaron Kennedy | 2010-03-11 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-11 | 4 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Move particles in their own plugin (Qt.labs.particles) | Yann Bodson | 2010-03-11 | 4 | -0/+4 |
| * | | | | | | | | | | Truncate title at right if too long (cannot currently ElideRight and center). | Warwick Allison | 2010-03-11 | 1 | -3/+1 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Document - and use - the qmlRegisterXXX template functions | mae | 2010-03-10 | 1 | -3/+2 |
| * | | | | | | | | | Use no-version-specified to mean any version (used to work, fixed again, | Warwick Allison | 2010-03-10 | 2 | -13/+13 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-15 | 4 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Fix build break caused by undefined symbol SetDialogPreference | Miikka Heikkinen | 2010-03-10 | 4 | -4/+4 |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix to mainwindow demo | Thierry Bastian | 2010-03-08 | 1 | -1/+1 |