3 files changed, 1 insertions, 24 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index 02acb00548..b3b573c64b 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -809,11 +809,7 @@ void tst_QLocale::negativeZero()
 {
     double negativeZero( 0.0 ); // Initialise to zero.
     uchar *ptr = (uchar *)&negativeZero;
-#ifdef QT_ARMFPA
-    ptr[3] = 0x80;
-#else
     ptr[QSysInfo::ByteOrder == QSysInfo::BigEndian ? 0 : 7] = 0x80;
-#endif
     QString s = QString::number(negativeZero);
     QCOMPARE(s, QString("0"));
 }
diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
index 7e4f591f47..f007d44262 100644
--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
@@ -4147,16 +4147,7 @@ void tst_QString::tortureSprintfDouble()
 #            error "Q_BYTE_ORDER not defined"
 #        endif
 
-#       ifdef QT_ARMFPA
-        buff[0] = data->bytes[4];
-        buff[1] = data->bytes[5];
-        buff[2] = data->bytes[6];
-        buff[3] = data->bytes[7];
-        buff[4] = data->bytes[0];
-        buff[5] = data->bytes[1];
-        buff[6] = data->bytes[2];
-        buff[7] = data->bytes[3];
-#        elif Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+#        if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
         for (uint i = 0; i < 8; ++i)
             buff[i] = data->bytes[i];
 #        else
diff --git a/tests/auto/other/compiler/tst_compiler.cpp b/tests/auto/other/compiler/tst_compiler.cpp
index d72a04c8aa..1f461ba10b 100644
--- a/tests/auto/other/compiler/tst_compiler.cpp
+++ b/tests/auto/other/compiler/tst_compiler.cpp
@@ -525,33 +525,23 @@ void tst_Compiler::privateStaticTemplateMember() const
 // the second member of the union
 static const union { unsigned char c[8]; double d; } qt_be_inf_bytes = { { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 } };
 static const union { unsigned char c[8]; double d; } qt_le_inf_bytes = { { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f } };
-static const union { unsigned char c[8]; double d; } qt_armfpa_inf_bytes = { { 0, 0, 0xf0, 0x7f, 0, 0, 0, 0 } };
 static inline double qt_inf()
 {
-#ifdef QT_ARMFPA
-    return qt_armfpa_inf_bytes.d;
-#else
     return (QSysInfo::ByteOrder == QSysInfo::BigEndian
             ? qt_be_inf_bytes.d
             : qt_le_inf_bytes.d);
-#endif
 }
 
 #else
 
 static const unsigned char qt_be_inf_bytes[] = { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 };
 static const unsigned char qt_le_inf_bytes[] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f };
-static const unsigned char qt_armfpa_inf_bytes[] = { 0, 0, 0xf0, 0x7f, 0, 0, 0, 0 };
 static inline double qt_inf()
 {
     const uchar *bytes;
-#ifdef QT_ARMFPA
-    bytes = qt_armfpa_inf_bytes;
-#else
     bytes = (QSysInfo::ByteOrder == QSysInfo::BigEndian
              ? qt_be_inf_bytes
              : qt_le_inf_bytes);
-#endif
 
     union { uchar c[8]; double d; } returnValue;
     memcpy(returnValue.c, bytes, sizeof(returnValue.c));