diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-23 09:24:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-23 09:40:54 +0200 |
| commit | 32f50225c4913de1af145ef2da9a11ffffac3ded (patch) | |
| tree | c2ecd51223706f3ad1234af883af9fdf33d846a2 /tests/auto/auto.pro | |
| parent | 88e6f8cff2974c46b1262f3a1a61e1440c664e0c (diff) | |
| parent | 9c58dd15885d813aeb5d83d2869c0f3a3ee5fcfe (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/direct2d/direct2d.pro
src/plugins/platforms/ios/qiosclipboard.mm
src/plugins/platforms/windows/windows.pro
Change-Id: Idffa03b3990bd642784f528821c5446b2e1008ef
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 0f8129cb74..3caa6a3b65 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -43,3 +43,8 @@ else:!qtConfig(process): SUBDIRS -= tools SUBDIRS -= dbus } } + +# QTBUG-63915 +boot2qt: { + contains(QT_ARCH, arm64): SUBDIRS -= dbus +} |