From f6b9119e307efa1e8811f35c2f90b31c4e3439c9 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 25 Jan 2014 19:41:37 +0200 Subject: Revert "Disable gui tests on Mac for now" This reverts commit 8ed38c70fd29680f7981d9d23581d46cf32139d0. Task-number: QTBUG-35344 Conflicts: tests/auto/auto.pro tests/auto/qml/debugger/debugger.pro Change-Id: I57bec5d7ede879e24ba2b0618333b4e4110c41df Reviewed-by: Simon Hausmann Reviewed-by: Liang Qi --- tests/auto/auto.pro | 9 +++------ tests/auto/qml/debugger/debugger.pro | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 8809693647..1895d55260 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -2,18 +2,15 @@ TEMPLATE=subdirs SUBDIRS=\ qml \ headersclean \ + particles \ + qmltest \ qmldevtools \ cmake \ installed_cmake qmldevtools.CONFIG = host_build -!mac { -SUBDIRS += \ - quick \ - particles \ - qmltest -} +!mac:SUBDIRS += quick installed_cmake.depends = cmake diff --git a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro index aa3ad6a3a3..98e41411ee 100644 --- a/tests/auto/qml/debugger/debugger.pro +++ b/tests/auto/qml/debugger/debugger.pro @@ -3,6 +3,8 @@ TEMPLATE = subdirs PUBLICTESTS += \ qqmlenginedebugservice \ qqmldebugjs \ + qqmlinspector \ + qqmlprofilerservice \ qpacketprotocol \ # qv8profilerservice \ # qdebugmessageservice \ -- cgit v1.2.3