diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:38:25 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:38:25 +0200 |
| commit | 06eab796bafa48c9e1a7e6c389bec84b8f42bd49 (patch) | |
| tree | 0db18767a303250e13d8291748595912d73be9e6 /src/multimediawidgets | |
| parent | ab29837c0efd4c07e17bbc8a4e49a592218d924a (diff) | |
| parent | 2838a99c5abc78cb6ff1b4d4c5872ea4ddd5147e (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: Id3427cb1a80956ba61373313c21b4b9aa007ea54
Diffstat (limited to 'src/multimediawidgets')
| -rw-r--r-- | src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc index 07fa63205..e722f4cb3 100644 --- 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} |