diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-24 16:02:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-24 16:02:55 +0100 |
| commit | 627d9cbd3c45834fe7aa1f2ee37fdfca07a03976 (patch) | |
| tree | c0805165804b2a9ef809318dd6a84132d2e57744 /tests/auto/other | |
| parent | fed2d237b71ac2f586dca0d35d104e7cf0cd9bd2 (diff) | |
| parent | 1b5f9bec03901519db3694d1b51fa7989ade1f25 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
Change-Id: I4ca87d44129fa5c1d8541cd58b8d62bc69080688
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/other.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index ea6290db42..35aaf4d48f 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -50,7 +50,7 @@ cross_compile: SUBDIRS -= \ wince*|!contains(QT_CONFIG, accessibility): SUBDIRS -= qaccessibility -!contains(QT_CONFIG, accessibility)|!contains(QT_CONFIG, xcb): SUBDIRS -= qaccessibilitylinux +!contains(QT_CONFIG, accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux !mac: SUBDIRS -= \ macgui \ |