diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-01-22 13:50:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-29 08:51:41 +0000 |
| commit | a32a5a2fc32441c402ddb67d893442c96c8fee0c (patch) | |
| tree | d093229c194b6e107a7906df446d21f4f2c2e7d4 /src/multimedia/camera/qcamerainfo.cpp | |
| parent | c4eee3b6ccd4dfd861f6a9345970a7cfc8d8b833 (diff) | |
| download | qtmultimedia-a32a5a2fc32441c402ddb67d893442c96c8fee0c.tar.gz | |
Make camera switching in the camera example work
Tested on macOS: If you have more than one camera installed, you
can now switch between them in the example.
Change-Id: I6d24c91e1e6c4d51eccc468ec9d5aefa46d9a99c
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/camera/qcamerainfo.cpp')
| -rw-r--r-- | src/multimedia/camera/qcamerainfo.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/multimedia/camera/qcamerainfo.cpp b/src/multimedia/camera/qcamerainfo.cpp index 5f64def30..4946142c2 100644 --- a/src/multimedia/camera/qcamerainfo.cpp +++ b/src/multimedia/camera/qcamerainfo.cpp @@ -125,7 +125,7 @@ bool QCameraInfo::operator==(const QCameraInfo &other) const */ bool QCameraInfo::isNull() const { - return d->isNull; + return !d; } /*! @@ -135,12 +135,12 @@ bool QCameraInfo::isNull() const */ QByteArray QCameraInfo::id() const { - return d->id; + return d ? d->id : QByteArray(); } bool QCameraInfo::isDefault() const { - return d->isDefault; + return d ? d->isDefault : false; } /*! @@ -148,7 +148,7 @@ bool QCameraInfo::isDefault() const */ QString QCameraInfo::description() const { - return d->description; + return d ? d->description : QString(); } /*! @@ -156,7 +156,7 @@ QString QCameraInfo::description() const */ QCamera::Position QCameraInfo::position() const { - return d->position; + return d ? d->position : QCamera::UnspecifiedPosition; } /*! @@ -175,7 +175,7 @@ QCamera::Position QCameraInfo::position() const */ int QCameraInfo::orientation() const { - return d->orientation; + return d ? d->orientation : 0; } QCameraInfo::QCameraInfo(QCameraInfoPrivate *p) |