Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-05-27 | 30 | -731/+742 |
|\ | |||||
| * | Removed unnecessary PlatSec capabilities from spectrum demo DLL | Gareth Stockwell | 2010-05-26 | 2 | -2/+2 |
| * | Added missing PlatSec capabilities to spectrum demo DLL | Gareth Stockwell | 2010-05-26 | 1 | -0/+1 |
| * | Build fix for spectrum demo when -qtnamespace is used | Gareth Stockwell | 2010-05-25 | 9 | -24/+27 |
| * | Fixed license headers in spectrum demo | Gareth Stockwell | 2010-05-25 | 28 | -688/+716 |
* | | Merge remote branch 'origin/4.7' into oslo-staging-1 | Aaron McCarthy | 2010-05-27 | 3 | -5/+5 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-26 | 3 | -5/+5 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-26 | 2 | -4/+4 |
| | |\ \ | |||||
| | | * | | Unify naming of import plugin targets | Joona Petrell | 2010-05-26 | 2 | -4/+4 |
| | * | | | Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap". | Warwick Allison | 2010-05-26 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | escape backslashes | Oswald Buddenhagen | 2010-05-26 | 1 | -2/+2 |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-05-25 | 11 | -9/+24 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-05-24 | 11 | -9/+24 |
| |\ \ \ | |||||
| | * \ \ | Merge remote branch 'origin/4.7' into oslo-staging-1 | Aaron McCarthy | 2010-05-24 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-05-21 | 11 | -9/+24 |
| | |\ \ \ \ | |||||
| | | * | | | | Examples: Fix compilation with namespace. | ck | 2010-05-20 | 9 | -1/+22 |
| | | * | | | | Use QApplication::arguments() to check for command line args | Harald Fernengel | 2010-05-20 | 2 | -8/+2 |
* | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-05-25 | 3 | -14/+19 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-05-25 | 3 | -14/+19 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Removed DEPLOYMENT from demos/spectrum/spectrum.pro | Gareth Stockwell | 2010-05-21 | 1 | -13/+0 |
| | * | | | | Install source for spectrum demo | Gareth Stockwell | 2010-05-21 | 3 | -0/+18 |
| | * | | | | Fixed path for copying launcher script for spectrum demo | Gareth Stockwell | 2010-05-21 | 1 | -1/+1 |
* | | | | | | License header. | Warwick Allison | 2010-05-25 | 2 | -0/+82 |
* | | | | | | Integrate some QML examples and demos into qtdemo | Alan Alpert | 2010-05-24 | 11 | -29/+316 |
|/ / / / / | |||||
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-21 | 60 | -0/+2460 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Add license headers for .qml files. | Jason McDonald | 2010-05-21 | 60 | -0/+2460 |
| | |/ / | |/| | | |||||
* | | | | Fix shadow building of spectrum demo | Rhys Weatherley | 2010-05-21 | 1 | -1/+1 |
|/ / / | |||||
* | | | Some minor example fixes | Alan Alpert | 2010-05-20 | 1 | -0/+2 |
| |/ |/| | |||||
* | | Rename Component::errorsString() -> errorString() (and also for | Bea Lam | 2010-05-20 | 2 | -4/+4 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-19 | 3 | -28/+32 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-19 | 3 | -28/+32 |
| |\ \ | |||||
| | * | | Documentation | Yann Bodson | 2010-05-18 | 1 | -0/+16 |
| | * | | Photoviewer example fixes. | Yann Bodson | 2010-05-18 | 2 | -28/+16 |
* | | | | Merge commit 'remotes/origin/4.7' into symbian47 | Thomas Zander | 2010-05-19 | 107 | -1191/+13678 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-05-19 | 12 | -1285/+0 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Andrew den Exter | 2010-05-18 | 67 | -561/+578 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | Removed mediaservices. | Kurt Korbatits | 2010-05-18 | 12 | -1285/+0 |
| * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-05-17 | 98 | -5/+13777 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | * | | Fix anomaly demo control strip icon placement | Miikka Heikkinen | 2010-05-14 | 1 | -5/+7 |
| | * | | Compilation fix for Metrowerks compiler | Gareth Stockwell | 2010-05-12 | 1 | -1/+1 |
| | * | | Spectrum Analyzer demo Symbian fix | Janne Koskinen | 2010-05-11 | 1 | -12/+10 |
| | * | | Corrected headers for spectrum analyzer demo | Gareth Stockwell | 2010-05-06 | 72 | -14/+44 |
| | * | | Add spectrum analyzer demo app | Gareth Stockwell | 2010-05-05 | 97 | -0/+13742 |
* | | | | Set edit focus to proper control in flightinfo demo | Miikka Heikkinen | 2010-05-18 | 1 | -0/+4 |
* | | | | Fix weatherinfo and flightinfo to only request WLAN connection once | Miikka Heikkinen | 2010-05-18 | 2 | -50/+23 |
|/ / / | |||||
* | | | Move xmldata example into rssnews demo. | Yann Bodson | 2010-05-17 | 8 | -0/+218 |
* | | | Removed dependency of QDeclarativeWebView to private Qt (Declarative) API | Simon Hausmann | 2010-05-13 | 1 | -22/+7 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-12 | 38 | -491/+231 |
|\ \ \ | |||||
| * | | | Flickable small API changes. | Yann Bodson | 2010-05-12 | 4 | -13/+9 |
| * | | | Expand if available space changes. | Warwick Allison | 2010-05-11 | 1 | -0/+6 |