Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move private QDeclarativeMetaProperty functions into the private class | Aaron Kennedy | 2010-02-25 | 10 | -49/+69 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-25 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Yann Bodson | 2010-02-25 | 28 | -633/+259 |
| |\ | |||||
| * | | QML Text item clipping logic was reversed | Yann Bodson | 2010-02-25 | 1 | -2/+2 |
* | | | Make QML_REGISTER...TYPE functions unnecessary (still exist for now). | Warwick Allison | 2010-02-25 | 4 | -25/+25 |
| |/ |/| | |||||
* | | Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView" | Aaron Kennedy | 2010-02-25 | 3 | -574/+2 |
* | | Fix include of renamed header | Justin McPherson | 2010-02-25 | 2 | -2/+2 |
* | | Change Multimedia declarative module in line with recent commits. | Justin McPherson | 2010-02-25 | 3 | -9/+14 |
* | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-24 | 24 | -59/+252 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-24 | 24 | -57/+124 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-24 | 24 | -57/+124 |
| | |\ | |||||
| | | * | Add -mediaservice argument to configure. | Andrew den Exter | 2010-02-24 | 1 | -11/+13 |
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 23 | -46/+111 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 23 | -46/+111 |
| | | | |\ | |||||
| | | | | * | Remove active qDebugs. | Justin McPherson | 2010-02-23 | 12 | -42/+38 |
| | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging | Nicholas Young | 2010-02-23 | 18 | -28/+212 |
| | | | | |\ | |||||
| | | | | | * | Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. | Justin McPherson | 2010-02-23 | 4 | -4/+4 |
| | | | | | * | Add private header warning. | Justin McPherson | 2010-02-23 | 5 | -0/+54 |
| | | | | * | | Added QNetworkRequest constructor to QMediaContent. | Nicholas Young | 2010-02-23 | 2 | -0/+15 |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-24 | 1 | -2/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | compile fix with namespaces after a broken automatical merge | hjk | 2010-02-24 | 1 | -2/+0 |
| | |/ / / / | |||||
* | | | | | | Install the extensions in the given uri. | Roberto Raggi | 2010-02-24 | 1 | -7/+6 |
* | | | | | | Install the QML extensions. | Roberto Raggi | 2010-02-24 | 2 | -5/+14 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Alan Alpert | 2010-02-24 | 3 | -8/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add support for qml imports directory in configure, qmake, and qmlengine | mae | 2010-02-24 | 3 | -8/+20 |
* | | | | | | | Fix building without the XmlPatterns Module | Alan Alpert | 2010-02-24 | 1 | -0/+2 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Alan Alpert | 2010-02-24 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Build fix when using <QtDeclarative> include. | Alexis Menard | 2010-02-24 | 1 | -0/+3 |
* | | | | | | | Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView | Alan Alpert | 2010-02-24 | 3 | -2/+574 |
* | | | | | | | Explain the onPropertyChanged pattern in the docs. | Alan Alpert | 2010-02-24 | 1 | -0/+11 |
|/ / / / / / | |||||
* | | | | | | Make QDeclarativeMetaType and QDeclarativeType private | Aaron Kennedy | 2010-02-24 | 13 | -26/+30 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-24 | 23 | -317/+328 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Aaron Kennedy | 2010-02-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix wrong property name in qdeclarativeitem docs | Leonardo Sobral Cunha | 2010-02-24 | 1 | -1/+1 |
| * | | | | | | | Fixup tests after QDeclarative class renames | Aaron Kennedy | 2010-02-24 | 1 | -1/+1 |
| * | | | | | | | Simplify QML element registration headers | Aaron Kennedy | 2010-02-24 | 21 | -315/+326 |
| |/ / / / / / | |||||
* | | | | | | | Don't crash if the currentIndex is set while creating a delegate. | Martin Jones | 2010-02-24 | 2 | -1/+5 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 10 | -62/+188 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add an "asynchonous" property to Image. | Martin Jones | 2010-02-24 | 8 | -58/+178 |
| * | | | | | | Removed unnecessary update calls in qmlgraphicsitem | Leonardo Sobral Cunha | 2010-02-24 | 1 | -4/+0 |
| * | | | | | | Automatically connect to a notify signal if the requested signal is | Bea Lam | 2010-02-24 | 1 | -0/+10 |
* | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt | Warwick Allison | 2010-02-24 | 74 | -13/+14852 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-24 | 74 | -13/+14852 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Make this function non-static. | Aaron McCarthy | 2010-02-23 | 1 | -1/+1 |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-23 | 74 | -13/+14852 |
| | |\ \ \ \ | |||||
| | | * | | | | Make compile on Maemo6. | Aaron McCarthy | 2010-02-23 | 3 | -9/+16 |
| | | * | | | | Merge remote branch 'staging/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-23 | 15 | -28/+158 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-22 | 74 | -13/+14835 |
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | * | | | | | Fix build on Symbian. | Aaron McCarthy | 2010-02-23 | 3 | -2/+12 |
| | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Change initialization order. | Aaron McCarthy | 2010-02-22 | 1 | -1/+1 |