diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-24 20:37:33 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-24 20:37:33 +0100 |
commit | 487844fc62bdf048224d6fc3b7eaae6347d4457b (patch) | |
tree | 763dc03ad77fd5b43ef74e817423540caa015e4b /tests/auto/other | |
parent | 4ed048dded34dbe2ce2842f0d40d9f54cd7571b0 (diff) | |
parent | 6cacd19db56b632964c3b2453bc273dac50446c9 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I13c7ea6a74eb98606cf45702ae068101943bec6a
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/other.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 673e922fdd..0e9f054a01 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -24,6 +24,10 @@ SUBDIRS=\ windowsmobile \ toolsupport \ +!qtHaveModule(gui): SUBDIRS -= \ + qcomplextext \ + qprocess_and_guieventloop \ + !qtHaveModule(widgets): SUBDIRS -= \ gestures \ lancelot \ |