From 1789422de864998649c026a2c633a8bd801f50c2 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 11 Jul 2017 15:55:22 +0200 Subject: [PATCH] QmlDesigner: Check for qmldir of QtQuick.Controls If QtQuick Controls 1 are missing there is no reason to build QmlDesigner. Change-Id: Ic8777fef6addc460b05c8218d96aa13379f02cea Reviewed-by: Mitch Curtis Reviewed-by: Tim Jenssen --- src/plugins/plugins.pro | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 49961bc7a4..d1c774128b 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -77,7 +77,11 @@ qtHaveModule(designercomponents_private) { DO_NOT_BUILD_QMLDESIGNER = $$(DO_NOT_BUILD_QMLDESIGNER) isEmpty(DO_NOT_BUILD_QMLDESIGNER):qtHaveModule(quick-private) { - SUBDIRS += qmldesigner + exists($$[QT_INSTALL_QML]/QtQuick/Controls/qmldir) { + SUBDIRS += qmldesigner + } else { + warning("QmlDesigner plugin has been disabled since Qt Quick Controls 1 are not installed.") + } } else { !qtHaveModule(quick-private) { warning("QmlDesigner plugin has been disabled since the Qt Quick module is not available.") -- GitLab