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 /tools | |
| parent | 62a654cc902197cc99326879076ba53b6509dc67 (diff) | |
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 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 196fdc9540..b630d289a5 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2704,10 +2704,6 @@ void Configure::generateConfigfiles() tmpStream << "#define QT_BUILD_INTERNAL" << endl; tmpStream << endl; } - tmpStream << "/* Machine byte-order */" << endl; - tmpStream << "#define Q_BIG_ENDIAN 4321" << endl; - tmpStream << "#define Q_LITTLE_ENDIAN 1234" << endl; - tmpStream << "#define Q_BYTE_ORDER Q_LITTLE_ENDIAN" << endl; if (dictionary[ "QPA" ] == "yes") tmpStream << endl << "#define Q_WS_QPA" << endl; |