Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-07 | 8 | -10/+32 |
|\ | |||||
| * | Accept enter key in the webbrower demo url input. | Martin Jones | 2010-06-07 | 1 | -0/+4 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-04 | 7 | -10/+28 |
| |\ | |||||
| | * | Improve input panel handling in declarative demos and examples | Joona Petrell | 2010-06-03 | 7 | -10/+28 |
* | | | Fixed `make install' for qmediaplayer demo. | Rohan McGovern | 2010-06-07 | 1 | -1/+1 |
|/ / | |||||
* | | Standalone Qml demos for Fluidlauncher | Alessandro Portale | 2010-06-03 | 31 | -0/+725 |
|/ | |||||
* | Fix some bugs in the QML Web Browser buttons | Alan Alpert | 2010-05-31 | 2 | -1/+2 |
* | Fix zoom bug in QML Web Browser demo | Alan Alpert | 2010-05-31 | 2 | -3/+3 |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-30 | 3 | -10/+17 |
|\ | |||||
| * | Some tweaks on the QML-enhanced QtDemo | Alan Alpert | 2010-05-30 | 3 | -10/+17 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-05-29 | 1 | -0/+1 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-05-27 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge commit 'origin/4.7' into symbian47 | Thomas Zander | 2010-05-27 | 12 | -11/+26 |
| | |\ | |||||
| | * \ | Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7 | Shane Kearns | 2010-05-26 | 17 | -48/+422 |
| | |\ \ | |||||
| | * | | | Make link on linux/symbian | Thomas Zander | 2010-05-25 | 1 | -0/+1 |
* | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-05-28 | 30 | -731/+742 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | 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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-27 | 12 | -11/+26 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge remote branch 'origin/4.7' into oslo-staging-1 | Aaron McCarthy | 2010-05-27 | 3 | -5/+5 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | 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 |
* | | | | | | | | Tweak aesthetics of QML viewer inside QtDemo | Alan Alpert | 2010-05-27 | 8 | -175/+118 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | 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 |
| |/ / / / / / | |||||
* | | | | | | | 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 |