summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.cpp
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2012-02-17 14:17:54 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-20 09:36:51 +0100
commit3cb078a23cb8b86169bd9d8259f5658be0c2082e (patch)
tree81f3692c53532c2384607cfd0d5c4f0f5442f9fb /src/corelib/global/qglobal.cpp
parent52072a8c8acb1184a649bf0e78d92d108fb0bb24 (diff)
Rename Q_PROCESSOR_POWERPC to Q_PROCESSOR_POWER
IBM's POWER and the PowerPC architecture have been merged into a single ISA, the Power ISA (see http://www.power.org). Use this unified name in Qt. Change-Id: Ia41492b0031d890843e43c5f7ecd1e60c65bb75b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
-rw-r--r--src/corelib/global/qglobal.cpp21
1 files changed, 15 insertions, 6 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 44d44b2cdb..eea4397dcd 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1489,18 +1489,27 @@ bool qSharedBuild()
*/
/*!
- \macro Q_PROCESSOR_POWERPC
+ \macro Q_PROCESSOR_POWER
\relates <QtGlobal>
- Defined if the application is compiled for PowerPC processors. Qt currently
- supports one optional PowerPC variant: \l Q_PROCESSOR_POWERPC_64.
+ Defined if the application is compiled for POWER processors. Qt currently
+ supports two Power variants: \l Q_PROCESSOR_POWER_32 and \l
+ Q_PROCESSOR_POWER_64.
*/
/*!
- \macro Q_PROCESSOR_POWERPC_64
+ \macro Q_PROCESSOR_POWER_32
\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 if the application is compiled for 32-bit Power processors. The \l
+ Q_PROCESSOR_POWER macro is also defined when Q_PROCESSOR_POWER_32 is
+ defined.
+*/
+/*!
+ \macro Q_PROCESSOR_POWER_64
+ \relates <QtGlobal>
+
+ Defined if the application is compiled for 64-bit Power processors. The \l
+ Q_PROCESSOR_POWER macro is also defined when Q_PROCESSOR_POWER_64 is
defined.
*/