diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-09-24 05:56:09 -0700 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2014-10-08 11:49:15 +0200 |
| commit | 58806890b496aef7c2880e651a8bb73b090cd72a (patch) | |
| tree | 78ef752bedf8912776fe4391f40762a89a23de34 | |
| parent | 02c80d7487c43dc63f8df7b0cf8f5b4f676e00b6 (diff) | |
Allow more generic platform names for linux based platforms.
Embedded platforms are not always called exactly
linux-g++ only. A platform may also be called
linux-arm-gnueabi-g++ or similar.
Fail gracefully if the host architecture is not x86_64.
We require 64bit for linking QtWebEngineCore.
Change-Id: I62c32606517bed6ed4307720d3c95e8019ec134b
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 789af9a13..80b64a653 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -1,9 +1,9 @@ defineTest(isPlatformSupported) { static: return(false) + !equals(QMAKE_HOST.arch, "x86_64"): return(false) osx:lessThan(QMAKE_XCODE_VERSION, 5.1): return(false) - linux-g++|win32-msvc2013|macx-clang: return(true) - android-g++-b2qt: return(true) + linux|win32-msvc2013|macx-clang: return(true) return(false) } |