diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:10:15 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:10:15 +0200 |
commit | 112595bf80ff0e0ed57f73d8efb628aaa0aa8dff (patch) | |
tree | 97597190310d7f17788fb27722e0e27073125350 /src/multimedia/camera/qcameraviewfindersettings.h | |
parent | 86915f01f7efef912513f750e60e73af28823d4d (diff) | |
parent | 9fdc4a3a635f094557c210408a600dde15a00935 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: Ib38fe1e0a4c937068741a9556748a18e35ba59af
Diffstat (limited to 'src/multimedia/camera/qcameraviewfindersettings.h')
-rw-r--r-- | src/multimedia/camera/qcameraviewfindersettings.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/multimedia/camera/qcameraviewfindersettings.h b/src/multimedia/camera/qcameraviewfindersettings.h index bfb3d08d3..ce10b68a2 100644 --- a/src/multimedia/camera/qcameraviewfindersettings.h +++ b/src/multimedia/camera/qcameraviewfindersettings.h @@ -34,10 +34,12 @@ #ifndef QCAMERAVIEWFINDERSETTINGS_H #define QCAMERAVIEWFINDERSETTINGS_H -#include <QtCore/qsharedpointer.h> #include <QtMultimedia/qtmultimediadefs.h> #include <QtMultimedia/qvideoframe.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qsize.h> + QT_BEGIN_NAMESPACE class QCameraViewfinderSettingsPrivate; @@ -51,9 +53,14 @@ public: ~QCameraViewfinderSettings(); QCameraViewfinderSettings& operator=(const QCameraViewfinderSettings &other); - bool operator==(const QCameraViewfinderSettings &other) const; - bool operator!=(const QCameraViewfinderSettings &other) const; +#ifdef Q_COMPILER_RVALUE_REFS + QCameraViewfinderSettings &operator=(QCameraViewfinderSettings &&other) Q_DECL_NOTHROW + { swap(other); return *this; } +#endif + + void swap(QCameraViewfinderSettings &other) Q_DECL_NOTHROW { d.swap(other.d); } + friend Q_MULTIMEDIA_EXPORT bool operator==(const QCameraViewfinderSettings &lhs, const QCameraViewfinderSettings &rhs) Q_DECL_NOTHROW; bool isNull() const; QSize resolution() const; @@ -78,6 +85,11 @@ public: private: QSharedDataPointer<QCameraViewfinderSettingsPrivate> d; }; +Q_DECLARE_SHARED(QCameraViewfinderSettings) + +inline bool operator!=(const QCameraViewfinderSettings &lhs, const QCameraViewfinderSettings &rhs) Q_DECL_NOTHROW +{ return !operator==(lhs, rhs); } + QT_END_NAMESPACE |