summaryrefslogtreecommitdiffstats
path: root/modules
Commit message (Collapse)AuthorAgeFilesLines
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-061-1/+1
| | | | | | | | | | | | | | | It does use a config test for now, just to make it clearer. The Mac backend currently requires widgets, but most of the others should work without it (just not supporting QVideoWidget/WindowControl). The QVideoDeviceControl interface was modified to remove the QIcon usage - it was never implemented. Unfortunately even the QML examples need widgets for the wrapper application, and will need to be ported to QtGui based wrapper. Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-074-34/+34
| | | | | | | | | | There are a few legacy bits left in place so it passes CI, and then qt5.git etc can be updated. Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a Reviewed-on: http://codereview.qt-project.org/5368 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Try to move widget/gvitem code into new QtMultimediaKitWidgets lib.Michael Goddard2011-08-251-0/+17
| | | | | | | Change-Id: I522b3e6d4465c6c5cce2483676e09320176837d6 Reviewed-on: http://codereview.qt.nokia.com/2665 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix the module.pri file.Michael Goddard2011-07-281-1/+1
| | | | | | | | | Should have QT_CONFIG+=multimediakit, not DEFINES. Change-Id: I72fcca770286f99c8711bd047e615d6e0e08d61f Reviewed-on: http://codereview.qt.nokia.com/2311 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Initial copy of QtMultimediaKit.Michael Goddard2011-06-291-0/+17
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2