diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-31 12:39:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-31 12:39:42 +0200 |
| commit | 29f01b32f58573b23bd35857376f6f92e15382a3 (patch) | |
| tree | b1a044f87e4b18d5ddd779dc1b63161ded1c3d1a /mkspecs/common | |
| parent | 300940a6c9eb0f74cefda7d76a5d19f56ec50253 (diff) | |
| parent | 0a7302abbc47a0db25f119ee4f5144bbaf0d9d6f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/configure.json
Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/ghs-integrity-armv8.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/ghs-integrity-armv8.conf b/mkspecs/common/ghs-integrity-armv8.conf index ee4ce458de..e454cfd245 100644 --- a/mkspecs/common/ghs-integrity-armv8.conf +++ b/mkspecs/common/ghs-integrity-armv8.conf @@ -17,8 +17,8 @@ os_directory = $$(INTEGRITY_DIR) isEmpty(os_directory): \ error("This qmakespec requires $INTEGRITY_DIR to be set") -QMAKE_CC = cxintarm64 -U__ARM_NEON__ -U__ARM_NEON -bsp $$bsp_name -os_dir $$os_directory -non_shared -QMAKE_CXX = cxintarm64 -U__ARM_NEON__ -U__ARM_NEON -bsp $$bsp_name -os_dir $$os_directory -non_shared +QMAKE_CC = cxintarm64 -bsp $$bsp_name -os_dir $$os_directory -non_shared +QMAKE_CXX = cxintarm64 -bsp $$bsp_name -os_dir $$os_directory -non_shared QMAKE_LINK = $$QMAKE_CXX QMAKE_AR = $$QMAKE_CXX -archive -o |