summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2012-02-17 09:41:35 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-18 02:32:46 +0100
commit7e2afb9168b3f07dd3a0d97cc7d7572bd5b6e67b (patch)
tree1ca22535530fd88510ff9d0eb5fe5267c1b63808
parente0d9fade038130ad408715e946c5c08cd2faf81e (diff)
downloadqtbase-7e2afb9168b3f07dd3a0d97cc7d7572bd5b6e67b.tar.gz
Document Q_PROCESSOR_* macros
All known processors and their variants/revisions are documented. I added Q_PROCESSOR_MIPS_V based on the MIPS64 online documentation, which documents MIPS64 as a superset of MIPS IV and MIPS V. Change-Id: Ie2796d4f03499283aa2c96d60f5e37bd74a36ab0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
-rw-r--r--src/corelib/global/qglobal.cpp215
-rw-r--r--src/corelib/global/qprocessordetection.h3
2 files changed, 218 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 58a3a6b7fd..44d44b2cdb 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1360,6 +1360,221 @@ bool qSharedBuild()
*/
/*!
+ \macro Q_PROCESSOR_ALPHA
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for Alpha processors.
+*/
+
+/*!
+ \macro Q_PROCESSOR_ARM
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for ARM processors. Qt currently
+ supports three optional ARM revisions: \l Q_PROCESSOR_ARM_V5, \l
+ Q_PROCESSOR_ARM_V6, and \l Q_PROCESSOR_ARM_V7.
+*/
+/*!
+ \macro Q_PROCESSOR_ARM_V5
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for ARMv5 processors. The \l
+ Q_PROCESSOR_ARM macro is also defined when Q_PROCESSOR_ARM_V5 is defined.
+*/
+/*!
+ \macro Q_PROCESSOR_ARM_V6
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for ARMv6 processors. The \l
+ Q_PROCESSOR_ARM and \l Q_PROCESSOR_ARM_V5 macros are also defined when
+ Q_PROCESSOR_ARM_V6 is defined.
+*/
+/*!
+ \macro Q_PROCESSOR_ARM_V7
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for ARMv7 processors. The \l
+ Q_PROCESSOR_ARM, \l Q_PROCESSOR_ARM_V5, and \l Q_PROCESSOR_ARM_V6 macros
+ are also defined when Q_PROCESSOR_ARM_V7 is defined.
+*/
+
+/*!
+ \macro Q_PROCESSOR_AVR32
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for AVR32 processors.
+*/
+
+/*!
+ \macro Q_PROCESSOR_BLACKFIN
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for Blackfin processors.
+*/
+
+/*!
+ \macro Q_PROCESSOR_IA64
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for IA-64 processors. This includes
+ all Itanium and Itanium 2 processors.
+*/
+
+/*!
+ \macro Q_PROCESSOR_MIPS
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for MIPS processors. Qt currently
+ supports seven MIPS revisions: \l Q_PROCESSOR_MIPS_I, \l
+ Q_PROCESSOR_MIPS_II, \l Q_PROCESSOR_MIPS_III, \l Q_PROCESSOR_MIPS_IV, \l
+ Q_PROCESSOR_MIPS_V, \l Q_PROCESSOR_MIPS_32, and \l Q_PROCESSOR_MIPS_64.
+*/
+/*!
+ \macro Q_PROCESSOR_MIPS_I
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for MIPS-I processors. The \l
+ Q_PROCESSOR_MIPS macro is also defined when Q_PROCESSOR_MIPS_I is defined.
+*/
+/*!
+ \macro Q_PROCESSOR_MIPS_II
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for MIPS-II processors. The \l
+ Q_PROCESSOR_MIPS and \l Q_PROCESSOR_MIPS_I macros are also defined when
+ Q_PROCESSOR_MIPS_II is defined.
+*/
+/*!
+ \macro Q_PROCESSOR_MIPS_32
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for MIPS32 processors. The \l
+ Q_PROCESSOR_MIPS, \l Q_PROCESSOR_MIPS_I, and \l Q_PROCESSOR_MIPS_II macros
+ are also defined when Q_PROCESSOR_MIPS_32 is defined.
+*/
+/*!
+ \macro Q_PROCESSOR_MIPS_III
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for MIPS-III processors. The \l
+ Q_PROCESSOR_MIPS, \l Q_PROCESSOR_MIPS_I, and \l Q_PROCESSOR_MIPS_II macros
+ are also defined when Q_PROCESSOR_MIPS_III is defined.
+*/
+/*!
+ \macro Q_PROCESSOR_MIPS_IV
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for MIPS-IV processors. The \l
+ Q_PROCESSOR_MIPS, \l Q_PROCESSOR_MIPS_I, \l Q_PROCESSOR_MIPS_II, and \l
+ Q_PROCESSOR_MIPS_III macros are also defined when Q_PROCESSOR_MIPS_IV is
+ defined.
+*/
+/*!
+ \macro Q_PROCESSOR_MIPS_V
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for MIPS-V processors. The \l
+ Q_PROCESSOR_MIPS, \l Q_PROCESSOR_MIPS_I, \l Q_PROCESSOR_MIPS_II, \l
+ Q_PROCESSOR_MIPS_III, and \l Q_PROCESSOR_MIPS_IV macros are also defined
+ when Q_PROCESSOR_MIPS_V is defined.
+*/
+/*!
+ \macro Q_PROCESSOR_MIPS_64
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for MIPS64 processors. The \l
+ Q_PROCESSOR_MIPS, \l Q_PROCESSOR_MIPS_I, \l Q_PROCESSOR_MIPS_II, \l
+ Q_PROCESSOR_MIPS_III, \l Q_PROCESSOR_MIPS_IV, and \l Q_PROCESSOR_MIPS_V
+ macros are also defined when Q_PROCESSOR_MIPS_64 is defined.
+*/
+
+/*!
+ \macro Q_PROCESSOR_POWERPC
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for PowerPC processors. Qt currently
+ supports one optional PowerPC variant: \l Q_PROCESSOR_POWERPC_64.
+*/
+/*!
+ \macro Q_PROCESSOR_POWERPC_64
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for 64-bit PowerPC processors. The
+ \l Q_PROCESSOR_POWERPC macro is also defined when Q_PROCESSOR_POWERPC_64 is
+ defined.
+*/
+
+/*!
+ \macro Q_PROCESSOR_S390
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for S/390 processors. Qt supports
+ one optional variant of S/390: Q_PROCESSOR_S390_X.
+*/
+/*!
+ \macro Q_PROCESSOR_S390_X
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for S/390x processors. The \l
+ Q_PROCESSOR_S390 macro is also defined when Q_PROCESSOR_S390_X is defined.
+*/
+
+/*!
+ \macro Q_PROCESSOR_SH
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for SuperH processors. Qt currently
+ supports one SuperH revision: \l Q_PROCESSOR_SH_4A.
+*/
+/*!
+ \macro Q_PROCESSOR_SH_4A
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for SuperH 4A processors. The \l
+ Q_PROCESSOR_SH macro is also defined when Q_PROCESSOR_SH_4A is defined.
+*/
+
+/*!
+ \macro Q_PROCESSOR_SPARC
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for SPARC processors. Qt currently
+ supports one optional SPARC revision: \l Q_PROCESSOR_SPARC_V9.
+*/
+/*!
+ \macro Q_PROCESSOR_SPARC_V9
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for SPARC V9 processors. The \l
+ Q_PROCESSOR_SPARC macro is also defined when Q_PROCESSOR_SPARC_V9 is
+ defined.
+*/
+
+/*!
+ \macro Q_PROCESSOR_X86
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for x86 processors. Qt currently
+ supports two x86 variants: \l Q_PROCESSOR_X86_32 and \l Q_PROCESSOR_X86_64.
+*/
+/*!
+ \macro Q_PROCESSOR_X86_32
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for 32-bit x86 processors. This
+ includes all i386, i486, i586, and i686 processors. The \l Q_PROCESSOR_X86
+ macro is also defined when Q_PROCESSOR_X86_32 is defined.
+*/
+/*!
+ \macro Q_PROCESSOR_X86_64
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for 64-bit x86 processors. This
+ includes all AMD64, Intel 64, and other x86_64/x64 processors. The \l
+ Q_PROCESSOR_X86 macro is also defined when Q_PROCESSOR_X86_64 is defined.
+*/
+
+/*!
\macro QT_DISABLE_DEPRECATED_BEFORE
\relates <QtGlobal>
diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
index bec070747f..69815ba199 100644
--- a/src/corelib/global/qprocessordetection.h
+++ b/src/corelib/global/qprocessordetection.h
@@ -137,6 +137,9 @@
# if defined(_MIPS_ARCH_MIPS4) || (defined(__mips) && __mips - 0 >= 4)
# define Q_PROCESSOR_MIPS_IV
# endif
+# if defined(_MIPS_ARCH_MIPS5) || (defined(__mips) && __mips - 0 >= 5)
+# define Q_PROCESSOR_MIPS_V
+# endif
# if defined(_MIPS_ARCH_MIPS64) || defined(__mips64)
# define Q_PROCESSOR_MIPS_64
# endif