diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-29 06:45:10 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-29 06:45:10 (GMT) |
| commit | 77bd318b2892ad2a6beefee84c8e1436f4f7f386 (patch) | |
| tree | 0de55e09200679501da73babed5cce1d4b558781 /src/corelib/global | |
| parent | 7eba68adc4a7862d9474179592e5c8393a7acdbb (diff) | |
| parent | d22d08f3f8a70edfc66c0f6c2fd952688b64fcc2 (diff) | |
| download | Qt-77bd318b2892ad2a6beefee84c8e1436f4f7f386.zip Qt-77bd318b2892ad2a6beefee84c8e1436f4f7f386.tar.gz Qt-77bd318b2892ad2a6beefee84c8e1436f4f7f386.tar.bz2 | |
Merge commit 'qt/master-stable'
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index a767c31..5e5ce49 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -672,9 +672,7 @@ namespace QT_NAMESPACE {} in which case _BOOL is not defined this is the default in 4.2 compatibility mode triggered by -compat=4 */ # if __SUNPRO_CC >= 0x500 -# if __SUNPRO_CC < 0x570 -# define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS -# endif +# define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS /* see http://developers.sun.com/sunstudio/support/Ccompare.html */ # if __SUNPRO_CC >= 0x590 # define Q_ALIGNOF(type) __alignof__(type) |