diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:02:16 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:02:16 +0200 |
| commit | 60ee6f64e145c10a4ea3577da9dd7f38252f9a2e (patch) | |
| tree | ed0e408d2b564d7dc1a99e007909645b6f3e4894 /src/imports | |
| parent | e48a9f0dd45647260a61fcdf1056ceecbca210e4 (diff) | |
| parent | e2fb22c15a53372f768aa362c37caa0d6f4b57c8 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I2442bd4b49e0a322c26d178fdb57d4a51b7a8835
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameracapture.cpp | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativetorch.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp index 22d87ec22..96611f0ea 100644 --- a/src/imports/multimedia/qdeclarativecameracapture.cpp +++ b/src/imports/multimedia/qdeclarativecameracapture.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype CameraCapture \instantiates QDeclarativeCameraCapture - \brief An interface for capturing camera images + \brief An interface for capturing camera images. \ingroup multimedia_qml \inqmlmodule QtMultimedia \ingroup camera_qml diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp index 266eadf00..954926b98 100644 --- a/src/imports/multimedia/qdeclarativetorch.cpp +++ b/src/imports/multimedia/qdeclarativetorch.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \qmltype Torch \instantiates QDeclarativeTorch \inqmlmodule QtMultimedia - \brief Simple control over torch functionality + \brief Simple control over torch functionality. \ingroup multimedia_qml |