diff options
| author | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2012-01-30 11:39:27 +0100 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2012-01-30 12:35:10 +0100 |
| commit | 7100319c7f1a4907aba486c2c5d7d37183a3a9cf (patch) | |
| tree | fb76463762ae0bf2ae5dfa5cb615e5fbf455d43f | |
| parent | dc919fdff43cd7d4cd1fff4ed57d3c26d3e8014d (diff) | |
Compile QMimeType &operator=(const QMimeType &other) unconditionally.
Change-Id: I9a49845eaf54835e57cfa4dfe125a972026477b4
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Faure <faure@kde.org>
| -rw-r--r-- | src/mimetypes/qmime_global.h | 4 | ||||
| -rw-r--r-- | src/mimetypes/qmimetype.cpp | 2 | ||||
| -rw-r--r-- | src/mimetypes/qmimetype.h | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/src/mimetypes/qmime_global.h b/src/mimetypes/qmime_global.h index d6d21a3..b315215 100644 --- a/src/mimetypes/qmime_global.h +++ b/src/mimetypes/qmime_global.h @@ -29,8 +29,4 @@ # define QMIME_EXPORT Q_DECL_IMPORT #endif -#ifndef TEST_COMPILER_RVALUE_REFS -#define TEST_COMPILER_RVALUE_REFS 0 -#endif - #endif // QMIME_GLOBAL_H diff --git a/src/mimetypes/qmimetype.cpp b/src/mimetypes/qmimetype.cpp index 604e956..e37ee61 100644 --- a/src/mimetypes/qmimetype.cpp +++ b/src/mimetypes/qmimetype.cpp @@ -173,7 +173,6 @@ QMimeType::QMimeType(const QMimeType &other) : // ------------------------------------------------------------------------------------------------ -#if !defined(Q_COMPILER_RVALUE_REFS) || TEST_COMPILER_RVALUE_REFS == 0 /*! \fn QMimeType &QMimeType::operator=(const QMimeType &other); \brief Assigns the data of \a other to this QMimeType object, and returns a reference to this object. @@ -184,7 +183,6 @@ QMimeType &QMimeType::operator=(const QMimeType &other) d = other.d; return *this; } -#endif // ------------------------------------------------------------------------------------------------ diff --git a/src/mimetypes/qmimetype.h b/src/mimetypes/qmimetype.h index 615479b..ca986a6 100644 --- a/src/mimetypes/qmimetype.h +++ b/src/mimetypes/qmimetype.h @@ -40,9 +40,7 @@ class QMIME_EXPORT QMimeType public: QMimeType(); QMimeType(const QMimeType &other); -#if !defined(Q_COMPILER_RVALUE_REFS) || TEST_COMPILER_RVALUE_REFS == 0 QMimeType &operator=(const QMimeType &other); -#endif #ifdef Q_COMPILER_RVALUE_REFS QMimeType(QMimeType &&other); |