diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-20 14:14:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-20 14:14:04 (GMT) |
| commit | cd2fd21578a80bc5ac121c0419ee00b1799d0a60 (patch) | |
| tree | 0704b9f656cb8ab896c3b5ec11c22b7bb73f247b | |
| parent | 46f37d42ec021b369c45c501440f6e66d5dd173d (diff) | |
| parent | 9b1b89323f2de37a5871848fbf955409a746913f (diff) | |
| download | Qt-cd2fd21578a80bc5ac121c0419ee00b1799d0a60.zip Qt-cd2fd21578a80bc5ac121c0419ee00b1799d0a60.tar.gz Qt-cd2fd21578a80bc5ac121c0419ee00b1799d0a60.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
configure.exe: endianess on Windows is always little endian
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 882dafe..3abfb0c 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3071,10 +3071,7 @@ void Configure::generateConfigfiles() tmpStream << "/* Machine byte-order */" << endl; tmpStream << "#define Q_BIG_ENDIAN 4321" << endl; tmpStream << "#define Q_LITTLE_ENDIAN 1234" << endl; - if (QSysInfo::ByteOrder == QSysInfo::BigEndian) - tmpStream << "#define Q_BYTE_ORDER Q_BIG_ENDIAN" << endl; - else - tmpStream << "#define Q_BYTE_ORDER Q_LITTLE_ENDIAN" << endl; + tmpStream << "#define Q_BYTE_ORDER Q_LITTLE_ENDIAN" << endl; tmpStream << endl << "// Compile time features" << endl; tmpStream << "#define QT_ARCH_" << dictionary["ARCHITECTURE"].toUpper() << endl; |