diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-28 08:58:14 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-28 08:58:14 (GMT) |
| commit | 75f5c3987340926744dc5090cb11cc2713baf11e (patch) | |
| tree | b50b1aacfbaf0a6c03d813a7c42340ef5ef463a3 | |
| parent | e393fe2c336e7c287892e3d1ba32b505a63e9e3a (diff) | |
| parent | 50764a0609bb9ea7e14e33456e77dd14c447f7e3 (diff) | |
| download | Qt-75f5c3987340926744dc5090cb11cc2713baf11e.zip Qt-75f5c3987340926744dc5090cb11cc2713baf11e.tar.gz Qt-75f5c3987340926744dc5090cb11cc2713baf11e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 3 | ||||
| -rw-r--r-- | tests/auto/qprocess/qprocess.pro | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index cc40336..39cafab 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -257,7 +257,8 @@ #define WTF_PLATFORM_MIDDLE_ENDIAN 1 #endif #define ARM_ARCH_VERSION 3 -#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) +#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) || defined(ARMV4I) \ + || defined(_ARMV4I_) || defined(armv4i) #undef ARM_ARCH_VERSION #define ARM_ARCH_VERSION 4 #endif diff --git a/tests/auto/qprocess/qprocess.pro b/tests/auto/qprocess/qprocess.pro index 892686d..77cfc82 100644 --- a/tests/auto/qprocess/qprocess.pro +++ b/tests/auto/qprocess/qprocess.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS = \ - testBatFiles \ testProcessCrash \ testProcessEcho \ testProcessEcho2 \ |