diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-07 10:18:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-07 10:24:33 +0200 |
| commit | 5d6073be27cb951b692bbcc4dc0dd54cc09c9fd4 (patch) | |
| tree | c87c236cd1b9c15eb5f40df3d86915687ab6c59a /mkspecs/common/ghs-integrity-armv7.conf | |
| parent | 97d7d80e7355019bb23bb03c2a82908e4436deb0 (diff) | |
| parent | bbb67ca32cebad312f02e916dff54e591b92af24 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
mkspecs/linux-icc/qmake.conf
mkspecs/macx-icc/qmake.conf
mkspecs/win32-icc/qmake.conf
src/gui/painting/qgrayraster.c
Change-Id: Ib08c45ea3215be05f986ecb3e1f4b37d209aa775
Diffstat (limited to 'mkspecs/common/ghs-integrity-armv7.conf')
| -rw-r--r-- | mkspecs/common/ghs-integrity-armv7.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/common/ghs-integrity-armv7.conf b/mkspecs/common/ghs-integrity-armv7.conf index 0c39e8ccdf..8cdff75382 100644 --- a/mkspecs/common/ghs-integrity-armv7.conf +++ b/mkspecs/common/ghs-integrity-armv7.conf @@ -7,6 +7,8 @@ QMAKE_PLATFORM = integrity include(unix.conf) +QMAKE_CFLAGS += -bigswitch + include(ghs-base.conf) QMAKE_CC = cxintarm -bsp $$(INTEGRITY_BSP) -os_dir $$(INTEGRITY_DIR) -non_shared |