Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Assigning 0xA UID3s to the new standalone qml demos | Alessandro Portale | 2010-06-17 | 7 | -7/+7 |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-16 | 2 | -0/+4 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-06-16 | 1 | -0/+2 |
| |\ | |||||
| | * | Move knowledge of QGraphicsObject out of qml engine | Aaron Kennedy | 2010-06-16 | 1 | -0/+2 |
| * | | Minor demo fixes | Alan Alpert | 2010-06-16 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-06-15 | 1 | -1/+0 |
|\ \ | |/ |/| | |||||
| * | Demos: Fix compilation with namespace. | ck | 2010-06-10 | 1 | -1/+0 |
* | | Add go button to webbrowser example. | Yann Bodson | 2010-06-10 | 5 | -4/+36 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-08 | 11 | -13/+44 |
|\ \ | |/ |/| | |||||
| * | Fix snake demo | mae | 2010-06-08 | 3 | -3/+12 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-06-08 | 8 | -10/+32 |
| |\ | |||||
| | * | 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 |
* | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-06-08 | 2 | -1/+43 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add missing license header. | Jason McDonald | 2010-05-28 | 1 | -0/+41 |
| * | | | | Moved Symbian-specific .pro directive into symbian{} block | Gareth Stockwell | 2010-05-27 | 1 | -1/+2 |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-06-07 | 1 | -0/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Make Fluidlauncher demo have same version as corresponding Qt | Miikka Heikkinen | 2010-06-07 | 1 | -0/+1 |
| | |/ / | |/| | | |||||
* | | | | 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 |