summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView"Aaron Kennedy2010-02-254-584/+2
* Fix include of renamed headerJustin McPherson2010-02-252-2/+2
* Change Multimedia declarative module in line with recent commits.Justin McPherson2010-02-253-9/+14
* Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-2432-64/+309
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2432-62/+181
| |\
| | * QMediaContent test; make sure to use network.Justin McPherson2010-02-241-1/+1
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2431-61/+180
| | |\
| | | * Rebuild configure.exeAndrew den Exter2010-02-241-0/+0
| | | * Add -mediaservice argument to configure.Andrew den Exter2010-02-244-14/+43
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2326-47/+137
| | | |\
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2326-47/+137
| | | | |\
| | | | | * Remove active qDebugs.Justin McPherson2010-02-2312-42/+38
| | | | | * Player demo updated with more user-friendly previous button behaviour.Nicholas Young2010-02-232-1/+13
| | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingNicholas Young2010-02-2318-28/+212
| | | | | |\
| | | | | | * Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.Justin McPherson2010-02-234-4/+4
| | | | | | * Add private header warning.Justin McPherson2010-02-235-0/+54
| | | | | * | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-233-0/+28
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-241-2/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | compile fix with namespaces after a broken automatical mergehjk2010-02-241-2/+0
* | | | | | | Install the extensions in the given uri.Roberto Raggi2010-02-241-7/+6
* | | | | | | Install the QML extensions.Roberto Raggi2010-02-244-5/+16
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-247-10/+62
|\ \ \ \ \ \ \
| * | | | | | | Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-247-10/+62
* | | | | | | | Fix building without the XmlPatterns ModuleAlan Alpert2010-02-241-0/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-241-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Build fix when using <QtDeclarative> include.Alexis Menard2010-02-241-0/+3
* | | | | | | | Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlViewAlan Alpert2010-02-244-2/+584
* | | | | | | | Explain the onPropertyChanged pattern in the docs.Alan Alpert2010-02-241-0/+11
|/ / / / / / /
* | | | | | | Make QDeclarativeMetaType and QDeclarativeType privateAaron Kennedy2010-02-2416-29/+36
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2436-318/+352
|\ \ \ \ \ \ \
| * | | | | | | Add subdirs .pro for examples/declarative/extendingAaron Kennedy2010-02-242-0/+14
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-241-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix wrong property name in qdeclarativeitem docsLeonardo Sobral Cunha2010-02-241-1/+1
| * | | | | | | | Fixup tests after QDeclarative class renamesAaron Kennedy2010-02-245-2/+2
| * | | | | | | | Simplify QML element registration headersAaron Kennedy2010-02-2428-315/+335
| |/ / / / / / /
* | | | | | | | Don't crash if the currentIndex is set while creating a delegate.Martin Jones2010-02-244-1/+53
|/ / / / / / /
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2416-68/+230
|\ \ \ \ \ \ \
| * | | | | | | Add an "asynchonous" property to Image.Martin Jones2010-02-2411-64/+191
| * | | | | | | Removed unnecessary update calls in qmlgraphicsitemLeonardo Sobral Cunha2010-02-241-4/+0
| * | | | | | | Make compile following renaming of class.Bea Lam2010-02-241-1/+1
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2462-893/+892
| |\ \ \ \ \ \ \
| * | | | | | | | Automatically connect to a notify signal if the requested signal isBea Lam2010-02-244-0/+39
* | | | | | | | | Manually merge 0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779Warwick Allison2010-02-242-2/+2
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2462-893/+892
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX t...Leonardo Sobral Cunha2010-02-2460-891/+891
| * | | | | | | | Fix declarative failing auto-test, missing rename of the test fileLeonardo Sobral Cunha2010-02-242-1/+1
| * | | | | | | | Compile warning-- for qmlviewerLeonardo Sobral Cunha2010-02-241-1/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtWarwick Allison2010-02-24129-115/+23092
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-24131-117/+23094
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Make this function non-static.Aaron McCarthy2010-02-231-1/+1