diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:34:32 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:36:10 -0700 |
| commit | d38fe875c7850ca2c6ca28f91e94ae276735fac8 (patch) | |
| tree | e5c92cef74e0853490d77cf0139b23f00d548a6e /src/3rdparty/iaccessible2/iaccessible2.pri | |
| parent | ac4e848c9802377b7c4ff673180f28b9ca76b746 (diff) | |
| parent | 627f0a7f7d775ecd263b95dd07fca44bfcb0c5cf (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
Diffstat (limited to 'src/3rdparty/iaccessible2/iaccessible2.pri')
| -rw-r--r-- | src/3rdparty/iaccessible2/iaccessible2.pri | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/3rdparty/iaccessible2/iaccessible2.pri b/src/3rdparty/iaccessible2/iaccessible2.pri index 367980a0d2..f60e67681d 100644 --- a/src/3rdparty/iaccessible2/iaccessible2.pri +++ b/src/3rdparty/iaccessible2/iaccessible2.pri @@ -1,10 +1,6 @@ ARCH_SUBDIR=x86 -contains(QMAKE_TARGET.arch, x86_64): { - ARCH_SUBDIR=amd64 -} else { - !contains(QMAKE_TARGET.arch, x86): message("ERROR: Could not detect architecture from QMAKE_TARGET.arch") -} +contains(QT_ARCH, x86_64): ARCH_SUBDIR = amd64 MIDL_GENERATED = $$PWD/generated/$${ARCH_SUBDIR} |