2 files changed, 12 insertions, 0 deletions
diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs
index f8bc70580..69e107871 100644
--- a/qbs-resources/imports/QbsLibrary.qbs
+++ b/qbs-resources/imports/QbsLibrary.qbs
@@ -19,10 +19,14 @@ QbsProduct {
     property string visibilityType: staticBuild ? "static" : "dynamic"
     property string headerInstallPrefix: "/include/qbs"
     property bool hasExporter: Utilities.versionCompare(qbs.version, "1.12") >= 0
+    property bool generatePkgConfigFile: qbsbuildconfig.generatePkgConfigFiles && hasExporter
     property bool generateQbsModule: install && qbsbuildconfig.generateQbsModules && hasExporter
     property bool staticBuild: Qt.core.staticBuild || qbsbuildconfig.staticBuild
     property stringList libType: [staticBuild ? "staticlibrary" : "dynamiclibrary"]
+
+    Depends { name: "Exporter.pkgconfig"; condition: generatePkgConfigFile }
     Depends { name: "Exporter.qbs"; condition: generateQbsModule }
+
     Group {
         fileTagsFilter: libType.concat("dynamiclibrary_symlink")
             .concat(qbs.buildVariant === "debug" ? ["debuginfo_dll"] : [])
@@ -37,6 +41,11 @@ QbsProduct {
         qbs.installDir: qbsbuildconfig.importLibInstallDir
     }
     Group {
+        fileTagsFilter: "Exporter.pkgconfig.pc"
+        qbs.install: install
+        qbs.installDir: qbsbuildconfig.pkgConfigInstallDir
+    }
+    Group {
         fileTagsFilter: "Exporter.qbs.module"
         qbs.install: install
         qbs.installDir: FileInfo.joinPaths(qbsbuildconfig.qbsModulesBaseDir, product.name)
diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
index 50a5ea79e..0627a5cf9 100644
--- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -19,8 +19,11 @@ Module {
     property bool installManPage: qbs.targetOS.contains("unix")
     property bool installHtml: true
     property bool installQch: false
+    property bool generatePkgConfigFiles: installApiHeaders && qbs.targetOS.contains("unix")
+                                          && !qbs.targetOS.contains("darwin")
     property bool generateQbsModules: installApiHeaders
     property string docInstallDir: "share/doc/qbs/html"
+    property string pkgConfigInstallDir: FileInfo.joinPaths(libDirName, "pkgconfig")
     property string qbsModulesBaseDir: FileInfo.joinPaths(libDirName, "qbs", "modules")
     property string relativeLibexecPath: "../" + libexecInstallDir
     property string relativePluginsPath: "../" + libDirName