Deprecate Artifact.condition.

This never really worked. We have the outputArtifacts script for that
now.

Change-Id: I4c80ec1bcfcfe5a7e93edff1dfbd9a2139da3682
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/corelib/language/builtindeclarations.cpp b/src/lib/corelib/language/builtindeclarations.cpp
index eef7f78eb..c8383f6dd 100644
--- a/src/lib/corelib/language/builtindeclarations.cpp
+++ b/src/lib/corelib/language/builtindeclarations.cpp
@@ -129,7 +129,7 @@ void BuiltinDeclarations::addArtifactItem()
 {
     ItemDeclaration item(QLatin1String("Artifact"));
     item << conditionProperty();
-    // ### remove Artifact.fileName in qbs 1.4
+    // ### remove Artifact.fileName and Artifact.condition in qbs 1.4
     item << PropertyDeclaration(QLatin1String("fileName"), PropertyDeclaration::Verbatim);
     item << PropertyDeclaration(QLatin1String("filePath"), PropertyDeclaration::Verbatim);
     item << PropertyDeclaration(QLatin1String("fileTags"), PropertyDeclaration::Variant);
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 5da3e3f0c..43e409be4 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -690,8 +690,14 @@ public:
 void ProjectResolver::resolveRuleArtifact(const RulePtr &rule, Item *item,
                                           bool *hasAlwaysUpdatedArtifact)
 {
-    if (!m_evaluator->boolValue(item, QLatin1String("condition")))
+    // TODO: Remove this whole block in 1.4.
+    if (!m_evaluator->boolValue(item, QLatin1String("condition"))) {
+        m_logger.printWarning(ErrorInfo(Tr::tr("Artifact.condition is deprecated. If you need "
+            "dynamic artifacts, use the outputArtifacts script instead of Artifact items."),
+            item->location()));
         return;
+    }
+
     RuleArtifactPtr artifact = RuleArtifact::create();
     rule->artifacts += artifact;
     artifact->location = item->location();