summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Move private QDeclarativeMetaProperty functions into the private classAaron Kennedy2010-02-2510-49/+69
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-251-2/+2
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-02-2528-633/+259
| |\
| * | QML Text item clipping logic was reversedYann Bodson2010-02-251-2/+2
* | | Make QML_REGISTER...TYPE functions unnecessary (still exist for now).Warwick Allison2010-02-254-25/+25
| |/ |/|
* | Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView"Aaron Kennedy2010-02-253-574/+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-2424-59/+252
|\ \ | |/ |/|
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2424-57/+124
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2424-57/+124
| | |\
| | | * Add -mediaservice argument to configure.Andrew den Exter2010-02-241-11/+13
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2323-46/+111
| | | |\
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2323-46/+111
| | | | |\
| | | | | * Remove active qDebugs.Justin McPherson2010-02-2312-42/+38
| | | | | * 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-232-0/+15
| * | | | | | 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-242-5/+14
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-243-8/+20
|\ \ \ \ \ \
| * | | | | | Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-243-8/+20
* | | | | | | 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-243-2/+574
* | | | | | | Explain the onPropertyChanged pattern in the docs.Alan Alpert2010-02-241-0/+11
|/ / / / / /
* | | | | | Make QDeclarativeMetaType and QDeclarativeType privateAaron Kennedy2010-02-2413-26/+30
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2423-317/+328
|\ \ \ \ \ \
| * \ \ \ \ \ 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-241-1/+1
| * | | | | | | Simplify QML element registration headersAaron Kennedy2010-02-2421-315/+326
| |/ / / / / /
* | | | | | | Don't crash if the currentIndex is set while creating a delegate.Martin Jones2010-02-242-1/+5
|/ / / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2410-62/+188
|\ \ \ \ \ \
| * | | | | | Add an "asynchonous" property to Image.Martin Jones2010-02-248-58/+178
| * | | | | | Removed unnecessary update calls in qmlgraphicsitemLeonardo Sobral Cunha2010-02-241-4/+0
| * | | | | | Automatically connect to a notify signal if the requested signal isBea Lam2010-02-241-0/+10
* | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtWarwick Allison2010-02-2474-13/+14852
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2474-13/+14852
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make this function non-static.Aaron McCarthy2010-02-231-1/+1
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2374-13/+14852
| | |\ \ \ \
| | | * | | | Make compile on Maemo6.Aaron McCarthy2010-02-233-9/+16
| | | * | | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2315-28/+158
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2274-13/+14835
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Fix build on Symbian.Aaron McCarthy2010-02-233-2/+12
| | | | |/ / / | | | |/| | |
| | | * | | | Change initialization order.Aaron McCarthy2010-02-221-1/+1