summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2014-10-10 09:52:24 +0200
committerJani Heikkinen <jani.heikkinen@digia.com>2014-10-10 10:19:19 +0200
commit3c42bb02d4a38af925958707398a179b0c94fea9 (patch)
tree76f3f96d2333dad8e1872f36c7643cc7ce9fd991
parent2cc9a92ad3796e6ec1e4cdfb3fe68eddc86ad4ac (diff)
Revert "Allow more generic platform names for linux based platforms."
We need a better solution to find out if we are building on a 64bit system. This reverts commit 58806890b496aef7c2880e651a8bb73b090cd72a. Change-Id: I43c48b5cbc5e96f93b65165b0445670a832b0206 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
-rw-r--r--tools/qmake/mkspecs/features/functions.prf4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 80b64a653..789af9a13 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|win32-msvc2013|macx-clang: return(true)
+ linux-g++|win32-msvc2013|macx-clang: return(true)
+ android-g++-b2qt: return(true)
return(false)
}