From f465a59fcd181d94b77eeb821485a8bc39ae960e Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@theqtcompany.com>
Date: Thu, 18 Aug 2016 15:54:13 +0200
Subject: Fix file scope for Properties conditions

The file scope must correspond to the file where the Properties item is
instantiated, because that's where the imports need to be looked up.

Change-Id: Icfc0fd30bd43ee069ec7a4d2ea1a1e9b88560b2d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
 .../import-in-properties-condition.qbs                         |  5 +++++
 .../import-in-properties-condition/modules/amodule/m.qbs       | 10 ++++++++++
 .../import-in-properties-condition/modules/depmodule/m.qbs     |  5 +++++
 tests/auto/blackbox/tst_blackbox.cpp                           |  6 ++++++
 tests/auto/blackbox/tst_blackbox.h                             |  1 +
 5 files changed, 27 insertions(+)
 create mode 100644 tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs
 create mode 100644 tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs
 create mode 100644 tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs

(limited to 'tests')

diff --git a/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs b/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs
new file mode 100644
index 000000000..32b8d2a03
--- /dev/null
+++ b/tests/auto/blackbox/testdata/import-in-properties-condition/import-in-properties-condition.qbs
@@ -0,0 +1,5 @@
+import qbs
+
+Product {
+    Depends { name: "amodule" }
+}
diff --git a/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs
new file mode 100644
index 000000000..92ea2cd45
--- /dev/null
+++ b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/amodule/m.qbs
@@ -0,0 +1,10 @@
+import qbs
+import qbs.File
+
+Module {
+    Depends { name: "depmodule" }
+    Properties {
+        condition: File.exists("blubb")
+        depmodule.prop: "blubb"
+    }
+}
diff --git a/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs
new file mode 100644
index 000000000..4c2f9281d
--- /dev/null
+++ b/tests/auto/blackbox/testdata/import-in-properties-condition/modules/depmodule/m.qbs
@@ -0,0 +1,5 @@
+import qbs
+
+Module {
+    property string prop
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 784477986..60fe58d20 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -4187,6 +4187,12 @@ void TestBlackbox::iconsetApp()
     QVERIFY(regularFileExists(relativeProductBuildDir("iconsetapp") + "/iconsetapp.app/Contents/Resources/white.icns"));
 }
 
+void TestBlackbox::importInPropertiesCondition()
+{
+    QDir::setCurrent(testDataDir + "/import-in-properties-condition");
+    QCOMPARE(runQbs(), 0);
+}
+
 void TestBlackbox::importingProduct()
 {
     QDir::setCurrent(testDataDir + "/importing-product");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 5d70b8dc0..64e3b0770 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -137,6 +137,7 @@ private slots:
     void groupsInModules();
     void iconset();
     void iconsetApp();
+    void importInPropertiesCondition();
     void importingProduct();
     void infoPlist();
     void inputsFromDependencies();
-- 
cgit v1.2.3