diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-02 16:23:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-08 21:24:26 +0000 |
| commit | 28c9e0e606d104e526bb1c8e6e8bcda3ee0aa496 (patch) | |
| tree | f94de2034f1b8b8c2d315268e6bf3b11483dc0e3 /src/corelib/mimetypes | |
| parent | be56db2c49be02fd7083c5a02131462748e29bef (diff) | |
Remove handling of missing Q_COMPILER_RVALUE_REFS
Change-Id: I7bc6c455fbae4cdad584c76773299a6d8cd40c82
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/mimetypes')
| -rw-r--r-- | src/corelib/mimetypes/qmimetype.h | 2 | ||||
| -rw-r--r-- | src/corelib/mimetypes/qmimetype_p.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h index c496af7d58..6d6f9eb488 100644 --- a/src/corelib/mimetypes/qmimetype.h +++ b/src/corelib/mimetypes/qmimetype.h @@ -78,9 +78,7 @@ public: QMimeType(); QMimeType(const QMimeType &other); QMimeType &operator=(const QMimeType &other); -#ifdef Q_COMPILER_RVALUE_REFS QMimeType &operator=(QMimeType &&other) noexcept { swap(other); return *this; } -#endif void swap(QMimeType &other) noexcept { qSwap(d, other.d); diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h index 5a36e6613c..2918309ad7 100644 --- a/src/corelib/mimetypes/qmimetype_p.h +++ b/src/corelib/mimetypes/qmimetype_p.h @@ -103,7 +103,6 @@ QT_END_NAMESPACE } \ QT_END_NAMESPACE -#ifdef Q_COMPILER_RVALUE_REFS #define QMIMETYPE_BUILDER_FROM_RVALUE_REFS \ QT_BEGIN_NAMESPACE \ static QMimeType buildQMimeType ( \ @@ -122,6 +121,5 @@ QT_END_NAMESPACE return QMimeType(qMimeTypeData); \ } \ QT_END_NAMESPACE -#endif #endif // QMIMETYPE_P_H |