diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-01-08 10:35:18 -0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-18 07:05:13 +0100 |
| commit | 0e8030bf479eb08bb718899f698a3f513eb36844 (patch) | |
| tree | fc470e11ced79d1e743d3a1ed298a80f0c985703 | |
| parent | b6ce12d70e6e576a6a55d5b747aa9534657b04ff (diff) | |
Define Q_COMPILER_AUTO_FUNCTION in Qt 4.8.
This definition was missing. It's clear MSVC supports this feature
because it has been in use in qtconcurrentrun.h under an #ifdef
Q_COMPILER_DECLTYPE, which is defined for MSVC.
This is needed in order to re-enable lambdas and other functors in
QtConcurrent after the bug fix for QTBUG-28984.
Task-number: QTBUG-28984
Change-Id: I8c3994096dad120a47ad5f0a7dac6bdbe304fcae
(partly cherry-picked from Qt 5 commit 932034b3df322e7a9dc3d7979584019b46277e50)
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 6ac0de8477..e914edebfd 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -427,6 +427,7 @@ namespace QT_NAMESPACE {} #if defined(Q_CC_MSVC) && _MSC_VER >= 1600 # define Q_COMPILER_RVALUE_REFS +# define Q_COMPILER_AUTO_FUNCTION # define Q_COMPILER_AUTO_TYPE # define Q_COMPILER_LAMBDA # define Q_COMPILER_DECLTYPE @@ -528,6 +529,7 @@ namespace QT_NAMESPACE {} # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404 /* C++0x features supported in GCC 4.4: */ # define Q_COMPILER_VARIADIC_TEMPLATES +# define Q_COMPILER_AUTO_FUNCTION # define Q_COMPILER_AUTO_TYPE # define Q_COMPILER_EXTERN_TEMPLATES # define Q_COMPILER_DEFAULT_DELETE_MEMBERS |