diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-01-25 19:51:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-25 21:36:32 +0100 |
| commit | 0825d24cf5c35a7c6fe37088f23b793e33c69063 (patch) | |
| tree | df6e1af911fc97ee5bd987617dd2a8f69503ef04 /tests/auto/auto.pro | |
| parent | f6b9119e307efa1e8811f35c2f90b31c4e3439c9 (diff) | |
Revert "Disable quick autotests on mac until qtbase is fixed"
This reverts commit 08582091059d8ba805487eae5277bc9abdc3d4de.
Task-number: QTBUG-35344
Conflicts:
tests/auto/auto.pro
Change-Id: I9babc27c4c37900dd6603bd603e6bcf9e7f3d61f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 1895d55260..715f3e01ad 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,6 +1,7 @@ TEMPLATE=subdirs SUBDIRS=\ qml \ + quick \ headersclean \ particles \ qmltest \ @@ -10,8 +11,6 @@ SUBDIRS=\ qmldevtools.CONFIG = host_build -!mac:SUBDIRS += quick - installed_cmake.depends = cmake testcocoon: SUBDIRS -= headersclean |