diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:37:28 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:37:28 +0200 |
| commit | 1a3c0af6039e35de5f4f22216627ab8f46322cfc (patch) | |
| tree | af62401f7da091b736930dd91f116817f1f2ec70 /tests/auto/auto.pro | |
| parent | 0eea98461937a4c0f972c8fe1a70e0149b73e3f0 (diff) | |
| parent | 1cb4cd6e2d153bd1a4d53bfe4ccbeb6d8d269f55 (diff) | |
| download | qtsvg-1a3c0af6039e35de5f4f22216627ab8f46322cfc.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: If39eda43ff21d841aaa24ffed8b5793ff1239cce
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index e2d84ec..925e4cd 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -3,12 +3,13 @@ qtHaveModule(widgets) { SUBDIRS = \ qsvgdevice \ qsvggenerator \ - qsvgrenderer \ qsvgplugin \ qicon_svg \ cmake \ installed_cmake + !android: SUBDIRS += qsvgrenderer + installed_cmake.depends = cmake } !cross_compile: SUBDIRS += host.pro |