From 68609ca8a5507d5e192e8f60470dc9bc6fd45ce1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Date: Wed, 2 Oct 2013 11:42:24 +0200 Subject: [PATCH] make plugin _dependencies.pri file optional plugins that cannot be depended upon don't need it. of course, the project file needs to directly define the respective variables instead. this makes it possible to have stand-alone plugins in arbitrarily named directories. Change-Id: I166d997bb4db41feac9ffe897cefce382e533bb0 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> --- src/qtcreatorplugin.pri | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index 16c353c67ac..811227bbc20 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -1,4 +1,12 @@ -include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri)) +depfile = $$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri) +exists($$depfile) { + include($$depfile) + isEmpty(QTC_PLUGIN_NAME): \ + error("$$basename(depfile) does not define QTC_PLUGIN_NAME.") +} else { + isEmpty(QTC_PLUGIN_NAME): \ + error("QTC_PLUGIN_NAME is empty. Maybe you meant to create $$basename(depfile)?") +} TARGET = $$QTC_PLUGIN_NAME plugin_deps = $$QTC_PLUGIN_DEPENDS -- GitLab