Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView" | Aaron Kennedy | 2010-02-25 | 4 | -584/+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 | 32 | -64/+309 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-24 | 32 | -62/+181 |
| |\ | |||||
| | * | QMediaContent test; make sure to use network. | Justin McPherson | 2010-02-24 | 1 | -1/+1 |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-24 | 31 | -61/+180 |
| | |\ | |||||
| | | * | Rebuild configure.exe | Andrew den Exter | 2010-02-24 | 1 | -0/+0 |
| | | * | Add -mediaservice argument to configure. | Andrew den Exter | 2010-02-24 | 4 | -14/+43 |
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 26 | -47/+137 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 26 | -47/+137 |
| | | | |\ | |||||
| | | | | * | Remove active qDebugs. | Justin McPherson | 2010-02-23 | 12 | -42/+38 |
| | | | | * | Player demo updated with more user-friendly previous button behaviour. | Nicholas Young | 2010-02-23 | 2 | -1/+13 |
| | | | | * | 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 | 3 | -0/+28 |
| * | | | | | | 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 | 4 | -5/+16 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Alan Alpert | 2010-02-24 | 7 | -10/+62 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add support for qml imports directory in configure, qmake, and qmlengine | mae | 2010-02-24 | 7 | -10/+62 |
* | | | | | | | | 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 | 4 | -2/+584 |
* | | | | | | | | 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 | 16 | -29/+36 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-24 | 36 | -318/+352 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add subdirs .pro for examples/declarative/extending | Aaron Kennedy | 2010-02-24 | 2 | -0/+14 |
| * | | | | | | | 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 | 5 | -2/+2 |
| * | | | | | | | | Simplify QML element registration headers | Aaron Kennedy | 2010-02-24 | 28 | -315/+335 |
| |/ / / / / / / | |||||
* | | | | | | | | Don't crash if the currentIndex is set while creating a delegate. | Martin Jones | 2010-02-24 | 4 | -1/+53 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 16 | -68/+230 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add an "asynchonous" property to Image. | Martin Jones | 2010-02-24 | 11 | -64/+191 |
| * | | | | | | | Removed unnecessary update calls in qmlgraphicsitem | Leonardo Sobral Cunha | 2010-02-24 | 1 | -4/+0 |
| * | | | | | | | Make compile following renaming of class. | Bea Lam | 2010-02-24 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-24 | 62 | -893/+892 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Automatically connect to a notify signal if the requested signal is | Bea Lam | 2010-02-24 | 4 | -0/+39 |
* | | | | | | | | | Manually merge 0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779 | Warwick Allison | 2010-02-24 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 62 | -893/+892 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX t... | Leonardo Sobral Cunha | 2010-02-24 | 60 | -891/+891 |
| * | | | | | | | | Fix declarative failing auto-test, missing rename of the test file | Leonardo Sobral Cunha | 2010-02-24 | 2 | -1/+1 |
| * | | | | | | | | Compile warning-- for qmlviewer | Leonardo Sobral Cunha | 2010-02-24 | 1 | -1/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt | Warwick Allison | 2010-02-24 | 129 | -115/+23092 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | |||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-24 | 131 | -117/+23094 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Make this function non-static. | Aaron McCarthy | 2010-02-23 | 1 | -1/+1 |