summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | |
* | | | | | | 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
* | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix up a compile error.
| * | | | | | | 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
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8456
* | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows loading/decoding local images in an asynchronous thread (already the case for network images).
| * | | | | | | Removed unnecessary update calls in qmlgraphicsitemLeonardo Sobral Cunha2010-02-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: akennedy
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the "onFooChanged" form, even if the notify signal is not called "fooChanged". Task-number: QT-2783
* | | | | | | | | 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 ↵Leonardo Sobral Cunha2010-02-2460-891/+891
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to QDeclarativeXXX.
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-24131-117/+23094
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (121 commits) Make this function non-static. Make compile on Maemo6. Fix build on Symbian. Change initialization order. Increase try verify timeout. Add locking to bearer code. Fixed qnetworksession test on Mac. Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. ...
| | * | | | | Make this function non-static.Aaron McCarthy2010-02-231-1/+1
| | | | | | |
generated by cgit v0.12 at 2024-11-14 11:29:19 (GMT)