Fix crash with Properties item as child of Project item.

Change-Id: I5f9868d84447682922fdf97a1a71598cf180549c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

3 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/project-with-properties-item/project.qbs b/tests/auto/blackbox/testdata/project-with-properties-item/project.qbs
new file mode 100644
index 000000000..d59a26a94
--- /dev/null
+++ b/tests/auto/blackbox/testdata/project-with-properties-item/project.qbs
@@ -0,0 +1,12 @@
+import qbs 1.0
+
+Project {
+    property string binPath: "/usr/bin"
+    property string libPath: "/usr/lib"
+
+    Properties {
+        condition: qbs.targetOS.contains("osx")
+        binPath: "/Users/boo"
+        libPath: "/Libraries/foo"
+    }
+}
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index c08054877..e033892a1 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -1702,6 +1702,12 @@ void TestBlackbox::qmlDebugging()
     }
 }
 
+void TestBlackbox::projectWithPropertiesItem()
+{
+    QDir::setCurrent(testDataDir + "/project-with-properties-item");
+    QCOMPARE(runQbs(), 0);
+}
+
 void TestBlackbox::properQuoting()
 {
     QDir::setCurrent(testDataDir + "/proper quoting");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 1efcb34b4..a51e8c594 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -123,6 +123,7 @@ private slots:
     void mocCppIncluded();
     void objC();
     void qmlDebugging();
+    void projectWithPropertiesItem();
     void properQuoting();
     void propertiesBlocks();
     void resolve_project_data();