qbspkgconfig: Fix dependency name mapping

Change-Id: I4ed80de3b0186154b2c59587f30321912ccaa655
Fixes: QBS-1709
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 5 insertions, 3 deletions

diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs
index fa58c551a..ccd08febd 100644
--- a/share/qbs/module-providers/qbspkgconfig.qbs
+++ b/share/qbs/module-providers/qbspkgconfig.qbs
@@ -214,9 +214,9 @@ ModuleProvider {
                 setupQt(pkg);
                 continue;
             }
-            var moduleName = moduleMapping[packageName]
+            var moduleName = getModuleName(moduleMapping[packageName]
                     ? moduleMapping[packageName]
-                    : getModuleName(packageName);
+                    : packageName);
             var moduleInfo = getModuleInfo(pkg, staticMode);
             var deps = getModuleDependencies(pkg, staticMode);
 
@@ -228,7 +228,9 @@ ModuleProvider {
             module.writeLine("    version: " + ModUtils.toJSLiteral(moduleInfo.version));
             module.writeLine("    Depends { name: 'cpp' }");
             deps.forEach(function(dep) {
-                module.write("    Depends { name: '" + dep.name + "'");
+                var depName = getModuleName(
+                        moduleMapping[dep.name] ? moduleMapping[dep.name] : dep.name);
+                module.write("    Depends { name: '" + depName + "'");
                 for (var k in dep) {
                     if (k === "name")
                         continue;