From 5e8ec97d697b213f708f66af846db54acffcc55c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 29 Nov 2018 16:55:56 +0200 Subject: [PATCH] Do not build QmlDesigner tests when the plugin is disabled Change-Id: Iaf7e06be6b81040c36726aa76923b285e2402aef Reviewed-by: Christian Stenger --- tests/auto/qml/qml.pro | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index fd4a838a40b..2f9a2f1b2c0 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS += \ - qmldesigner \ qmleditor \ qmljssimplereader \ qmlprojectmanager \ @@ -9,3 +8,14 @@ SUBDIRS += \ reformatter \ qrcparser \ persistenttrie + +DO_NOT_BUILD_QMLDESIGNER = $$(DO_NOT_BUILD_QMLDESIGNER) +isEmpty(DO_NOT_BUILD_QMLDESIGNER):qtHaveModule(quick-private) { + SUBDIRS += qmldesigner +} else { + !qtHaveModule(quick-private) { + warning("QmlDesigner plugin has been disabled since the Qt Quick module is not available.") + } else { + warning("QmlDesigner plugin has been disabled since DO_NOT_BUILD_QMLDESIGNER is set.") + } +}