Michael Goddard be98375f90 Merge branch 'camera' of ssh://codereview.qt-project.org:29418/qt/qtmultimediakit ...

Conflicts:
	src/imports/multimedia/multimedia.cpp
	src/imports/multimedia/multimedia.pro

Change-Id: I9d4bc1aa65f89ac24dd12c1e2c21a02f49913e13

2011-09-26 14:17:32 +10:00

config.tests

Move resource policy usage to a config test.

2011-09-26 02:16:25 +02:00

doc

Clean some doc warnings.

2011-09-22 08:10:49 +02:00

examples

Fix widget dependencies for multimediawidget tests and examples.

2011-09-22 04:36:10 +02:00

modules

Try to move widget/gvitem code into new QtMultimediaKitWidgets lib.

2011-08-25 04:47:33 +02:00

src

Merge branch 'camera' of ssh://codereview.qt-project.org:29418/qt/qtmultimediakit

2011-09-26 14:17:32 +10:00

tests

Fix widget dependencies for multimediawidget tests and examples.

2011-09-22 04:36:10 +02:00

qtmultimediakit.pro

Moved demo(s) to examples.

2011-07-12 07:55:02 +02:00

sync.profile

Move resource policy usage to a config test.

2011-09-26 02:16:25 +02:00

Description

No description provided

17 MiB

Languages

C++ 90.5%

Objective-C++ 5.8%

QMake 1%

Objective-C 0.9%

QML 0.5%

Other 1%