diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-05 16:30:55 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-08 09:23:43 +0000 |
| commit | 0f4015bccaf42a9aea79b499cef73ba751d94ee4 (patch) | |
| tree | b3a2de55edcf48e826c642b8391f666aac0b88db /tests/auto | |
| parent | 80270003bb8bb62121f501213455192e96a9f137 (diff) | |
ModuleLoader: Add missing base values when merging Export items
We forgot to do this for alternatives, meaning that in Properties items
in Export items, "base" would not be properly set up.
Change-Id: Ieafe4933696074469aaf497d4e153ca92fa8f73b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/language/testdata/exports.qbs | 4 | ||||
| -rw-r--r-- | tests/auto/language/tst_language.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/language/testdata/exports.qbs b/tests/auto/language/testdata/exports.qbs index fb9b8a45c..83cb4f811 100644 --- a/tests/auto/language/testdata/exports.qbs +++ b/tests/auto/language/testdata/exports.qbs @@ -49,6 +49,10 @@ Project { Export { dummy.cFlags: base.concat("PRODUCT_" + product.name.toUpperCase()) dummy.cxxFlags: ["-bar"] + Properties { + condition: true + dummy.defines: base.concat(["DEF"]) + } } } Application { diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp index 49f3ec20f..ff7fb77ba 100644 --- a/tests/auto/language/tst_language.cpp +++ b/tests/auto/language/tst_language.cpp @@ -915,7 +915,7 @@ void TestLanguage::exports() QCOMPARE(propertyValue.toStringList(), QStringList() << "-bar"); propertyName = QStringList() << "dummy" << "defines"; propertyValue = product->moduleProperties->property(propertyName); - QCOMPARE(propertyValue.toStringList(), QStringList() << "ABC"); + QCOMPARE(propertyValue.toStringList(), QStringList({"ABC", "DEF"})); QCOMPARE(product->moduleProperties->moduleProperty("dummy", "productName").toString(), QString("myapp2")); QCOMPARE(product->moduleProperties->moduleProperty("dummy", |