diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-23 06:49:38 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-23 06:49:38 (GMT) |
| commit | 01116bb669f072af2227fff5f9da33bc77af7256 (patch) | |
| tree | 631439ee6a3ccc5204f3f71e54d449c2486915cc /tests/auto/auto.pro | |
| parent | 3083b436bd3adc6280d3b7ebcb75358454cb9623 (diff) | |
| parent | 127df63bbce367e7e2d77ae9f219feb5a4a2560e (diff) | |
| download | Qt-01116bb669f072af2227fff5f9da33bc77af7256.zip Qt-01116bb669f072af2227fff5f9da33bc77af7256.tar.gz Qt-01116bb669f072af2227fff5f9da33bc77af7256.tar.bz2 | |
Merge remote branch 'origin/master' into bearermanagement/staging
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 3034f30..5fd2dca 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -11,7 +11,6 @@ TEMPLATE = subdirs maketestselftest \ moc \ uic \ - uic3 \ guiapplauncher \ #atwrapper \ # These tests need significant updating, #uiloader \ # they have hardcoded machine names etc. @@ -69,6 +68,9 @@ Q3SUBDIRS += \ q3uridrag \ q3widgetstack +!cross_compile:Q3SUBDIRS += \ + uic3 + SUBDIRS += \ # exceptionsafety_objects \ shouldn't enable it languagechange \ |