From e9c2a363cb2baf16763112c9fb13e8eda323bb45 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 26 May 2017 14:34:48 +0200 Subject: [PATCH] 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 Reviewed-by: Thiago Macieira --- configure.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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