Remove more support for unsupported GCC versions.
Change-Id: I827c9f982a7d7d20913b99c8fdaf98437a0a73db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
472b06d63a
commit
1a49a529ee
@ -191,7 +191,7 @@ namespace QT_NAMESPACE {}
|
||||
#endif
|
||||
|
||||
#ifndef Q_REQUIRED_RESULT
|
||||
# if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1))
|
||||
# if defined(Q_CC_GNU)
|
||||
# define Q_REQUIRED_RESULT __attribute__ ((warn_unused_result))
|
||||
# else
|
||||
# define Q_REQUIRED_RESULT
|
||||
@ -310,7 +310,7 @@ QT_END_INCLUDE_NAMESPACE
|
||||
/*
|
||||
Warnings and errors when using deprecated methods
|
||||
*/
|
||||
#if (defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && (__GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2))) || defined(Q_CC_RVCT)
|
||||
#if defined(Q_CC_GNU) || defined(Q_CC_RVCT)
|
||||
# define Q_DECL_DEPRECATED __attribute__ ((__deprecated__))
|
||||
#elif defined(Q_CC_MSVC)
|
||||
# define Q_DECL_DEPRECATED __declspec(deprecated)
|
||||
@ -384,11 +384,7 @@ QT_END_INCLUDE_NAMESPACE
|
||||
|
||||
#if defined(__i386__) || defined(_WIN32) || defined(_WIN32_WCE)
|
||||
# if defined(Q_CC_GNU)
|
||||
#if !defined(Q_CC_INTEL) && ((100*(__GNUC__ - 0) + 10*(__GNUC_MINOR__ - 0) + __GNUC_PATCHLEVEL__) >= 332)
|
||||
# define QT_FASTCALL __attribute__((regparm(3)))
|
||||
#else
|
||||
# define QT_FASTCALL
|
||||
#endif
|
||||
# elif defined(Q_CC_MSVC)
|
||||
# define QT_FASTCALL __fastcall
|
||||
# else
|
||||
|
Loading…
Reference in New Issue
Block a user