diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-17 07:11:26 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-17 07:12:23 +0100 |
| commit | f596553e03c3969f6e7cb5344c05591da6e70dfb (patch) | |
| tree | 8aef667749e1adc015cbc9c5ec5b5af9c6d4c15c /tests/auto/auto.pro | |
| parent | e32845b137834ef46d68345a0029d4af7c1d85bb (diff) | |
| parent | 7030adff1869e850a7b983e88d7a773d5d594886 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/imports/dialogs/DefaultFileDialog.qml
src/imports/widgets/qquickqfiledialog.cpp
Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 8809693647..30bc175346 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -8,13 +8,6 @@ SUBDIRS=\ qmldevtools.CONFIG = host_build -!mac { -SUBDIRS += \ - quick \ - particles \ - qmltest -} - installed_cmake.depends = cmake testcocoon: SUBDIRS -= headersclean |