Merge branch 'stable' into dev

Conflicts: .qmake.conf Change-Id: Id3427cb1a80956ba61373313c21b4b9aa007ea54
2013-08-05 10:38:25 +02:00
parent ab29837c0e 2838a99c5a
commit 06eab796ba
36 changed files with 62 additions and 25 deletions
--- a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc
+++ b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc
@@ -57,7 +57,6 @@ QT += multimediawidgets

 \section2 Examples
 \list
-\li \l{QML Camera Example}
 \li \l{Camera Example}
 \li \l{Media Player Example}
 \li \l{Video Graphics Item Example}