diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-24 11:11:02 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 14:48:00 +0100 |
commit | 17ddce4692b31af4374b28cd40b9f25e8ed629cd (patch) | |
tree | 773832a8b53104941f5a9744535e41c5f68858f6 /configure.bat | |
parent | 62a654cc902197cc99326879076ba53b6509dc67 (diff) | |
download | qtbase-17ddce4692b31af4374b28cd40b9f25e8ed629cd.tar.gz |
Remove Q_BYTE_ORDER and -*-endian arguments from configures
Do not write Q_BYTE_ORDER to qconfig.h in the configures. Instead,
we #define Q_BYTE_ORDER in qprocessordetection.h, since many CPUs only
support a single endian format. For bi-endian processors, we set
Q_BYTE_ORDER depending on how the preprocessor sets __BYTE_ORDER__,
__BIG_ENDIAN__, or __LITTLE_ENDIAN__ (instead of using a compile test
to do so).
For operating systems that only support a single byte order, we can
check for Q_OS_* in addition to the preprocessor macros above. This is
possible because qprocessordetection.h is included by qglobal.h after
Q_OS_* and Q_CC_* detection has been done. Do this for Windows CE,
which is always little- endian according to MSDN.
Change-Id: I019a95e05252ef69895c4b38fbfa6ebfb6a943cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure.bat')
-rw-r--r-- | configure.bat | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.bat b/configure.bat index f0b6ce5310..b5ffb14731 100644 --- a/configure.bat +++ b/configure.bat @@ -67,9 +67,7 @@ if not exist src\corelib\global\qconfig.h ( md src\corelib\global if errorlevel 1 goto exit ) - echo #define Q_BIG_ENDIAN 4321 > src\corelib\global\qconfig.h - echo #define Q_LITTLE_ENDIAN 1234 >> src\corelib\global\qconfig.h - echo #define Q_BYTE_ORDER Q_LITTLE_ENDIAN >> src\corelib\global\qconfig.h + echo /* Generated by configure.bat - DO NOT EDIT! */ > src\corelib\global\qconfig.h ) if not exist tools\configure ( |