diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-16 15:24:50 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-17 09:09:30 +0000 |
| commit | d3e137c20248f6852a91341782011ca58534ed21 (patch) | |
| tree | ce9935dffb3deb8cc5625a57f9a62f74390cb025 /tests/auto/language/tst_language.h | |
| parent | d9b6a84900552b55117c8034743964726c2bc102 (diff) | |
| download | qbs-d3e137c20248f6852a91341782011ca58534ed21.tar.gz | |
ModuleLoader: Fix order of module merging
Dependencies must be merged before their dependents, because the merging
process for the former sets up data to be consumed by the merging
process for the latter.
Task-number: QBS-1275
Change-Id: Ide9146add79bf2b4fcf80d7ce95ac1d9d4ac20b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/language/tst_language.h')
| -rw-r--r-- | tests/auto/language/tst_language.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/language/tst_language.h b/tests/auto/language/tst_language.h index 7dff0c68a..019e520c1 100644 --- a/tests/auto/language/tst_language.h +++ b/tests/auto/language/tst_language.h @@ -143,6 +143,7 @@ private slots: void propertiesBlockInGroup(); void propertiesItemInModule(); void propertyAssignmentInExportedGroup(); + void qbs1275(); void qbsPropertiesInProjectCondition(); void qbsPropertyConvenienceOverride(); void relaxedErrorMode(); |