diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-18 18:04:09 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-10-07 21:44:41 +0000 |
commit | 94fb5037696a6022a56f947528b4570be5069369 (patch) | |
tree | 8374e98f5a8763cc9f7f94a9e9554f504ff32d3b /src/gui/image | |
parent | c644fab0ed92d79d9ce4e2e756ab1c5634e8d3df (diff) |
Mark ref-qualified members as always inline
MSVC and ICC on Windows always make calls to the dllexport'ed out-of-
line copy of an inline function when compiling in debug mode. This
creates an incompatibility when a compiler that understands ref-
qualified member functions (such as ICC) is used to compile code using a
DLL that was compiled with a compiler that doesn't understand (such as
MSVC 2013).
Task-number: QTBUG-48349
Change-Id: I42e7ef1a481840699a8dffff14053b7998a2a6bb
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qimage.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 888c7beb32..9d8e3efcc4 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -168,9 +168,9 @@ public: Format format() const; #if defined(Q_COMPILER_REF_QUALIFIERS) && !defined(QT_COMPILING_QIMAGE_COMPAT_CPP) - QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) const & Q_REQUIRED_RESULT + Q_ALWAYS_INLINE QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) const & Q_REQUIRED_RESULT { return convertToFormat_helper(f, flags); } - QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) && Q_REQUIRED_RESULT + Q_ALWAYS_INLINE QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) && Q_REQUIRED_RESULT { if (convertToFormat_inplace(f, flags)) return std::move(*this); |