summaryrefslogtreecommitdiffstats
Commit message (Collapse)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
| | | | | | | | | | Avoid having 2 'states' that have 'when' conditions that can be 'true' at the same time.
| * Fix QDeclarativePropertyAnimation to avoid property writes while stoppedLeonardo Sobral Cunha2010-02-251-0/+3
| | | | | | | | | | | | | | | | | | Avoid changing the value of the property, while the animation is stopped. This was triggered while changing the duration of the animation, while it was stopped. Task-number: QTBUG-8507 Reviewed-by: Michael Brasser
* | 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
| | | | | | | | | | We now prohibit QDeclarativeMetaProperty ever getting into a state where it is pointing to the attached object itself.
| * Remove QDeclarativeMetaProperty::createProperty() methodAaron Kennedy2010-02-257-126/+106
| | | | | | | | | | The behavior of createProperty() (to resolve dot properties) is now the behavior of the constructors.
| * 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
| | | | | | | | | | | | | | | | | | We don't want to allow manipulation of bindings and signal properties through the public API. Equivalents of the public functions now exist in QDeclarativeMetaPropertyPrivate for internal use.
| | * 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
| | | | | | | | | | | | | | | | Fix multimedia plugin.
| | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | (still doesn't work yet...)
| * | | | | Connections example could be turned incorrectlyYann Bodson2010-02-251-8/+4
| | |_|_|/ | |/| | | | | | | | | | | | | Task-number: QTBUG-8345
| * | | | 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
| | | | | | | | | | | | | | | | | | | | This reverts commit 327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5.
| | * | | 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
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/qml/qml.pri src/multimedia/qml/qmlaudio_p.h src/multimedia/qml/qmlgraphicsvideo_p.h src/multimedia/qml/qmlmediabase_p.h src/plugins/qmlmodules/multimedia/multimedia.cpp
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2432-62/+181
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QMediaContent test; make sure to use network. Rebuild configure.exe Add -mediaservice argument to configure. Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | | | * | QMediaContent test; make sure to use network.Justin McPherson2010-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andrew den Exter
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2431-61/+180
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Add -mediaservice argument to configure. Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | | | | * | Rebuild configure.exeAndrew den Exter2010-02-241-0/+0
| | | | | | |
| | | | | * | Add -mediaservice argument to configure.Andrew den Exter2010-02-244-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables building the default media service backend for a platform. Is on by default if the build environment requirements are met and -no-mediaservice disables the option. Reviewed-by: Justin McPherson
| | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2326-47/+137
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2326-47/+137
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | | | | | | * | Remove active qDebugs.Justin McPherson2010-02-2312-42/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to qWarning where appropriate, otherwise comment Reviewed-by: Dmytro Poplavskiy
| | | | | | | * | Player demo updated with more user-friendly previous button behaviour.Nicholas Young2010-02-232-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pressing previous within the first five seconds will go to the previous item in the playlist. Otherwise, it will seek to the beginning of the current item. Reviewed-by: Kurt Korbatits
| | | | | | | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Nicholas Young
| | | | | | | | * | Add private header warning.Justin McPherson2010-02-235-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kurt Korbatits
| | | | | | | * | | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-233-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now consistent with QMediaResource. Reviewed-by: Dmytro Poplavskiy
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-241-2/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: compile fix with namespaces after a broken automatical merge
| | | | * | | | | | 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
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8180
* | | | | | | | | React to QAbstractItemModel::modelReset() signal.Martin Jones2010-02-2516-1/+323
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8494
* | | | | | | | Install the extensions in the given uri.Roberto Raggi2010-02-241-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mae
* | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Could use to be renamed. Possibly to -QDeclarativeViewGraphicsWidget -QGraphicsDeclarativeViewWidget (Or QGraphicsD20, in the spirit of i18n) But those aren't any shorter. Task-number: QTBUG-7067
generated by cgit v0.12 at 2025-01-12 21:13:46 (GMT)