diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-11 17:18:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-11 18:34:14 +0200 |
| commit | 6c2a111f8c82b56388abf409a61a3e0d56a52156 (patch) | |
| tree | 0f5a7ad320f034233c065fc994980b10afe434ad /src/core/gyp_run.pro | |
| parent | c4fc323d0771e24ae726065cdce9eafef2c09c41 (diff) | |
| parent | d6e3ba85138a6147b9b34a1c3363b2d3b20ba284 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 41cdf4598..35b85b4c7 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -82,6 +82,7 @@ contains(QT_ARCH, "arm") { else: GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=0 arm_neon_optional=0 } + contains(QMAKE_CFLAGS, "-marm"): GYP_CONFIG += arm_thumb=0 contains(QMAKE_CFLAGS, "-mthumb"): GYP_CONFIG += arm_thumb=1 } |