diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-07-12 17:05:50 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-07-13 06:02:46 +0000 |
| commit | 3393c9fbb834750f9437e6fef42482602d307a0f (patch) | |
| tree | a84e4edfe6f77c619b3d79f28661032830fc9bb2 /share/qbs/modules/cpp/GenericGCC.qbs | |
| parent | 72d56f1e95b87cf6983e0b348d7c05528d095f18 (diff) | |
Report an error on unexpected output tags
The artifacts a dynamic rule produces need to be consistent with what it
declares in its outputFileTags property.
Somewhat suprisingly, such a check was missing so far, so we managed to
make such mistakes in our very own modules. These are also fixed here.
Change-Id: I9052a8c4b0423e8fd146c9fc67bf5c3ce752c638
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share/qbs/modules/cpp/GenericGCC.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index c79d95b68..871eeeefa 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -405,7 +405,7 @@ CppModule { outputFileTags: [ "bundle.input", "dynamiclibrary", "dynamiclibrary_symlink", "dynamiclibrary_symbols", "debuginfo_dll", - "dynamiclibrary_import", + "debuginfo_bundle","dynamiclibrary_import", "debuginfo_plist", ] outputArtifacts: { var artifacts = [{ @@ -514,7 +514,8 @@ CppModule { } inputsFromDependencies: ["dynamiclibrary_symbols", "dynamiclibrary_import", "staticlibrary"] - outputFileTags: ["bundle.input", "loadablemodule", "debuginfo_loadablemodule"] + outputFileTags: ["bundle.input", "loadablemodule", "debuginfo_loadablemodule", + "debuginfo_bundle","debuginfo_plist"] outputArtifacts: { var app = { filePath: FileInfo.joinPaths(product.destinationDirectory, @@ -551,7 +552,8 @@ CppModule { } inputsFromDependencies: ["dynamiclibrary_symbols", "dynamiclibrary_import", "staticlibrary"] - outputFileTags: ["bundle.input", "application", "debuginfo_app"] + outputFileTags: ["bundle.input", "application", "debuginfo_app","debuginfo_bundle", + "debuginfo_plist"] outputArtifacts: { var app = { filePath: FileInfo.joinPaths(product.destinationDirectory, |