diff options
| -rw-r--r-- | mkspecs/features/functions.prf | 4 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index c9bd65b03..f433de3b2 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -14,7 +14,9 @@ defineReplace(extractCFlag) { CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS OPTION = $$find(CFLAGS, $$1) OPTION = $$split(OPTION, =) - return ($$member(OPTION, 1)) + PARAM = $$member(OPTION, 1) + !isEmpty(PARAM): return ($$PARAM) + return ($$OPTION) } defineReplace(which) { diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index ed7745b89..0eea066e4 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -83,8 +83,10 @@ contains(QT_ARCH, "arm") { } } - if(isEmpty(MARMV)|lessThan(MARMV, 7)):contains(QMAKE_CFLAGS, "-marm"): gn_args += arm_use_thumb=false - else: contains(QMAKE_CFLAGS, "-mthumb"): gn_args += arm_use_thumb=true + MTHUMB = $$extractCFlag("-mthumb") + MARM = $$extractCFlag("-marm") + if (isEmpty(MARMV) | lessThan(MARMV, 7) | !isEmpty(MARM)): gn_args += arm_use_thumb=false + else: !isEmpty(MTHUMB): gn_args += arm_use_thumb=true } contains(QT_ARCH, "mips") { |