summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* docWarwick Allison2010-02-251-3/+1
* Fix documentation following MouseRegion -> MouseArea changeMartin Jones2010-02-251-9/+9
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-252-2/+5
|\
| * Recfactor in declarative snake demoLeonardo Sobral Cunha2010-02-251-2/+2
| * Fix QDeclarativePropertyAnimation to avoid property writes while stoppedLeonardo Sobral Cunha2010-02-251-0/+3
* | Add simple Package example.Martin Jones2010-02-252-0/+79
* | Document PackageMartin Jones2010-02-253-0/+55
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2558-990/+630
|\ \ | |/
| * Tweak QDeclarativeMetaProperty type category APIAaron Kennedy2010-02-256-47/+45
| * Remove QDeclarativeMetaProperty::AttachedAaron Kennedy2010-02-253-40/+13
| * Remove QDeclarativeMetaProperty::createProperty() methodAaron Kennedy2010-02-257-126/+106
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-02-2518-130/+155
| |\
| | * Add import Qt.widgets 4.6 to loader auto test using graphics widgetsJoona Petrell2010-02-251-0/+1
| | * Move private QDeclarativeMetaProperty functions into the private classAaron Kennedy2010-02-2512-105/+128
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-251-2/+2
| | |\
| | * | Make QML_REGISTER...TYPE functions unnecessary (still exist for now).Warwick Allison2010-02-254-25/+25
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2537-648/+316
| | |\ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2466-495/+1248
| | |\ \ \
| | * | | | Uses Qt.widgetsWarwick Allison2010-02-241-0/+1
| * | | | | Connections example could be turned incorrectlyYann Bodson2010-02-251-8/+4
| | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-02-2537-648/+316
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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
| * | | | | | | | | QML Text item clipping logic was reversedYann Bodson2010-02-251-2/+2
| |/ / / / / / / /
* | | | | | | | | React to QAbstractItemModel::modelReset() signal.Martin Jones2010-02-2516-1/+323
|/ / / / / / / /
* | | | | | | | 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