summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-05-26 14:34:48 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-05-31 12:57:47 +0000
commite9c2a363cb2baf16763112c9fb13e8eda323bb45 (patch)
treea05748623a4c0d2b6a580f785b5d10ea8e3a4928 /configure.pri
parentd56d2e0cb25e8190d58594eb1c397715c94416a1 (diff)
fix licheck calls on 32 bit systems
$$QMAKE_HOST.arch isn't very well defined for ia32 - on windows it's x86, on linux it may be anything from i386 to i686. test for != x86_64 instead. Task-number: QTBUG-61044 Change-Id: I8f3267b404fffbf479d87bee2e8ee8c6cd404b50 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri
index 45692d6b5c..673252dc51 100644
--- a/configure.pri
+++ b/configure.pri
@@ -137,7 +137,7 @@ defineReplace(qtConfFunc_licenseCheck) {
export(config.input.qt_edition)
} else {
equals(QMAKE_HOST.os, Linux) {
- equals(QMAKE_HOST.arch, x86): \
+ !equals(QMAKE_HOST.arch, x86_64): \
Licheck = licheck32
else: \
Licheck = licheck64