Install the QtHeaders products

This is needed when building a Qt module in isolation, to get at the
dependencies' module master headers when creating the Depends header.

Change-Id: I1e36a0265cb5932ab91b58d47c3edbeabd13dc36
Reviewed-by: Kai Koehne <kai.koehne@qt.io>

17 files changed, 37 insertions, 28 deletions

diff --git a/qbs/imports/QtHeaders.qbs b/qbs/imports/QtHeaders.qbs
index c5fa0c2047..d2499801e6 100644
--- a/qbs/imports/QtHeaders.qbs
+++ b/qbs/imports/QtHeaders.qbs
@@ -19,6 +19,9 @@ Product {
     qbs.profiles: ["qt_targetProfile"]
     aggregate: false
 
+    Depends { name: "Exporter.qbs" }
+    Exporter.qbs.fileName: project.simpleName + "_headers.qbs"
+
     Group {
         fileTagsFilter: ["hpp_public", "hpp_forwarding", "hpp_module", "hpp_depends"]
         qbs.install: product.install
@@ -40,6 +43,12 @@ Product {
                                            "qpa")
     }
 
+    Group {
+        fileTagsFilter: ["Exporter.qbs.module"]
+        qbs.install: true
+        qbs.installDir: FileInfo.joinPaths("lib/qbs/modules/Qt", project.simpleName + "_headers")
+    }
+
     property string baseDir: sourceDirectory
     property stringList shadowBuildFiles: []
     files: [baseDir + "/*.h", baseDir + "/**/*.h"].concat(
@@ -49,5 +58,6 @@ Product {
     Export {
         property stringList includePaths: project.includePaths
         property stringList publicIncludePaths: project.publicIncludePaths
+        prefixMapping: [{prefix: project.buildDirectory, replacement: qbs.installPrefix}]
     }
 }
diff --git a/qbs/imports/QtModuleProject.qbs b/qbs/imports/QtModuleProject.qbs
index c8305e888c..8fec95e67e 100644
--- a/qbs/imports/QtModuleProject.qbs
+++ b/qbs/imports/QtModuleProject.qbs
@@ -6,7 +6,7 @@ Project {
     property string moduleName: "Qt." + simpleName
     property string privateName: moduleName + "_private"
     property string tracepointsProductName: moduleName + "_tracepoints"
-    property string headersName: name + "Headers"
+    property string headersName: moduleName + "_headers"
     property string prefix
     property stringList includePaths: QtUtils.includesForModule(name + "-private", project.buildDirectory + "/include", project.version)
     property stringList publicIncludePaths: QtUtils.includesForModule(name, project.buildDirectory + "/include", project.version)
diff --git a/src/concurrent/concurrent.qbs b/src/concurrent/concurrent.qbs
index d866e94920..b86cb1b20a 100644
--- a/src/concurrent/concurrent.qbs
+++ b/src/concurrent/concurrent.qbs
@@ -13,7 +13,7 @@ QtModuleProject {
             "qtconcurrentmap.h": ["QtConcurrentMap"],
             "qtconcurrentrun.h": ["QtConcurrentRun"],
         })
-        Depends { name: "QtCoreHeaders" }
+        Depends { name: "Qt.core_headers" }
     }
 
     QtPrivateModule {
diff --git a/src/dbus/dbus.qbs b/src/dbus/dbus.qbs
index 0c9eadf22a..e28cad1d40 100644
--- a/src/dbus/dbus.qbs
+++ b/src/dbus/dbus.qbs
@@ -10,7 +10,7 @@ QtModuleProject {
     })
 
     QtHeaders {
-        Depends { name: "QtCoreHeaders" }
+        Depends { name: "Qt.core_headers" }
     }
 
     QtPrivateModule {
diff --git a/src/gui/gui.qbs b/src/gui/gui.qbs
index 68c44946a5..b3ea0d4965 100644
--- a/src/gui/gui.qbs
+++ b/src/gui/gui.qbs
@@ -19,7 +19,7 @@ QtModuleProject {
             project.qtbaseShadowDir + "/src/gui/qtgui-config.h",
             project.qtbaseShadowDir + "/src/gui/qtgui-config_p.h",
         ]
-        Depends { name: "QtCoreHeaders" }
+        Depends { name: "Qt.core_headers" }
     }
 
     QtPrivateModule {
diff --git a/src/network/network.qbs b/src/network/network.qbs
index 2638f99ad8..e3f625687c 100644
--- a/src/network/network.qbs
+++ b/src/network/network.qbs
@@ -17,7 +17,7 @@ QtModuleProject {
             project.qtbaseShadowDir + "/src/network/qtnetwork-config.h",
             project.qtbaseShadowDir + "/src/network/qtnetwork-config_p.h",
         ]
-        Depends { name: "QtCoreHeaders" }
+        Depends { name: "Qt.core_headers" }
     }
 
     QtPrivateModule {
diff --git a/src/opengl/opengl.qbs b/src/opengl/opengl.qbs
index d81a3ecc4d..3d4b291ff8 100644
--- a/src/opengl/opengl.qbs
+++ b/src/opengl/opengl.qbs
@@ -9,7 +9,7 @@ QtModuleProject {
     })
 
     QtHeaders {
-        Depends { name: "QtWidgetsHeaders" }
+        Depends { name: "Qt.widgets_headers" }
     }
 
     QtPrivateModule {
diff --git a/src/platformheaders/platformheaders.qbs b/src/platformheaders/platformheaders.qbs
index 6945bb2524..a17a531050 100644
--- a/src/platformheaders/platformheaders.qbs
+++ b/src/platformheaders/platformheaders.qbs
@@ -2,10 +2,9 @@ import qbs
 
 QtModuleProject {
     name: "QtPlatformHeaders"
-    simpleName: "platformheaders"
+    simpleName: "platform"
 
     QtHeaders {
-        name: "QtPlatformHeaders"
     }
 }
 /*
diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.qbs b/src/plugins/platforms/eglfs/eglfsdeviceintegration.qbs
index ad6ed445c5..eb45bd9243 100644
--- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.qbs
+++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.qbs
@@ -23,7 +23,7 @@ QtModule {
     Depends { name: "Qt.input_support_private"; required: false }
     Depends { name: "Qt.platformcompositor_support_private"; required: false }
     Depends { name: "Egl" }
-    Depends { name: "QtPlatformHeaders" }
+    Depends { name: "Qt.platform_headers" }
     Export {
         Depends { name: "Qt.egl_support_private" }
     }
diff --git a/src/plugins/platforms/xcb/xcb.qbs b/src/plugins/platforms/xcb/xcb.qbs
index 085fb9baea..3109ff49a2 100644
--- a/src/plugins/platforms/xcb/xcb.qbs
+++ b/src/plugins/platforms/xcb/xcb.qbs
@@ -47,7 +47,7 @@ QtModuleProject {
             name: "Qt.linuxaccessibility_support_private"
             required: false
         }
-        Depends { name: "QtPlatformHeaders" }
+        Depends { name: "Qt.platform_headers" }
 
         Depends { name: "Xcb_xlib"; condition: QtGuiPrivateConfig.xcb_xlib }
         Depends { name: "X11sm"; condition: QtGuiPrivateConfig.xcb_sm }
diff --git a/src/printsupport/printsupport.qbs b/src/printsupport/printsupport.qbs
index 9de743bf14..8999a43be4 100644
--- a/src/printsupport/printsupport.qbs
+++ b/src/printsupport/printsupport.qbs
@@ -17,7 +17,7 @@ QtModuleProject {
             project.qtbaseShadowDir + "/src/printsupport/qtprintsupport-config.h",
             project.qtbaseShadowDir + "/src/printsupport/qtprintsupport-config_p.h",
         ]
-        Depends { name: "QtCoreHeaders" }
+        Depends { name: "Qt.core_headers" }
     }
 
     QtPrivateModule {
diff --git a/src/sql/sql.qbs b/src/sql/sql.qbs
index 56c0c754f3..431d27d4a4 100644
--- a/src/sql/sql.qbs
+++ b/src/sql/sql.qbs
@@ -17,7 +17,7 @@ QtModuleProject {
             project.qtbaseShadowDir + "/src/sql/qtsql-config.h",
             project.qtbaseShadowDir + "/src/sql/qtsql-config_p.h",
         ]
-        Depends { name: "QtCoreHeaders" }
+        Depends { name: "Qt.core_headers" }
     }
 
     QtPrivateModule {
diff --git a/src/testlib/testlib.qbs b/src/testlib/testlib.qbs
index ea1f78f8aa..a08df4bc3c 100644
--- a/src/testlib/testlib.qbs
+++ b/src/testlib/testlib.qbs
@@ -17,7 +17,7 @@ QtModuleProject {
             project.qtbaseShadowDir + "/src/testlib/qttestlib-config.h",
             project.qtbaseShadowDir + "/src/testlib/qttestlib-config_p.h",
         ]
-        Depends { name: "QtCoreHeaders" }
+        Depends { name: "Qt.core_headers" }
     }
 
     QtPrivateModule {
diff --git a/src/tools/bootstrap-dbus/bootstrap-dbus.qbs b/src/tools/bootstrap-dbus/bootstrap-dbus.qbs
index 3a9349e9ad..11d4ded7ee 100644
--- a/src/tools/bootstrap-dbus/bootstrap-dbus.qbs
+++ b/src/tools/bootstrap-dbus/bootstrap-dbus.qbs
@@ -24,15 +24,15 @@ QtModuleProject {
         multiplexByQbsProperties: base.filter(function(name) { return name !== "buildVariants"; })
 
         Export {
-            Depends { name: "QtDBusHeaders" }
+            Depends { name: "Qt.dbus_headers" }
             Depends { name: "cpp" }
-            cpp.includePaths: project.includePaths.concat(QtDBusHeaders.includePaths)
+            cpp.includePaths: project.includePaths.concat(Qt.dbus_headers.includePaths)
         }
 
         Depends { name: "Qt.bootstrap_private" }
-        Depends { name: "QtDBusHeaders" }
+        Depends { name: "Qt.dbus_headers" }
 
-        cpp.includePaths: base.concat(project.includePaths, QtDBusHeaders.includePaths)
+        cpp.includePaths: base.concat(project.includePaths, Qt.dbus_headers.includePaths)
         cpp.defines: base.concat("QT_NO_FOREACH", "QT_NO_CAST_FROM_ASCII")
         cpp.cxxFlags: base.concat(Qt.global.privateConfig.dbus_host_cflags)
 
diff --git a/src/tools/bootstrap/bootstrap.qbs b/src/tools/bootstrap/bootstrap.qbs
index bb1eb330d9..62a9e7c79b 100644
--- a/src/tools/bootstrap/bootstrap.qbs
+++ b/src/tools/bootstrap/bootstrap.qbs
@@ -47,14 +47,14 @@ QtModuleProject {
         // Ignore debug_and_release for host tools.
         multiplexByQbsProperties: base.filter(function(name) { return name !== "buildVariants"; })
 
-        Depends { name: "QtCoreHeaders" }
-        Depends { name: "QtXmlHeaders" }
+        Depends { name: "Qt.core_headers" }
+        Depends { name: "Qt.xml_headers" }
         Depends { name: "cpp" }
         Depends { name: "qt_zlib" }
 
         cpp.includePaths: project.includePaths.concat(
-            QtCoreHeaders.includePaths,
-            QtXmlHeaders.includePaths,
+            Qt.core_headers.includePaths,
+            Qt.xml_headers.includePaths,
             project.qtbaseDir + "/mkspecs/" + Qt.global.privateConfig.hostMkspec)
         commonCppDefines: [
             "QT_BOOTSTRAPPED",
@@ -201,15 +201,15 @@ QtModuleProject {
 
         Export {
             Depends { name: "cpp" }
-            Depends { name: "QtCoreHeaders" }
-            Depends { name: "QtXmlHeaders" }
+            Depends { name: "Qt.core_headers" }
+            Depends { name: "Qt.xml_headers" }
             prefixMapping: base.concat([{
                 prefix: project.qtbaseShadowDir,
                 replacement: qbs.installPrefix
             }])
             cpp.includePaths: project.includePaths.concat(
-                QtCoreHeaders.includePaths,
-                QtXmlHeaders.includePaths,
+                Qt.core_headers.includePaths,
+                Qt.xml_headers.includePaths,
                 project.qtbaseDir + "/mkspecs/" + Qt.global.privateConfig.hostMkspec)
             cpp.cxxLanguageVersion: "c++11"
 
diff --git a/src/tools/moc/moc.qbs b/src/tools/moc/moc.qbs
index 68d5173c62..1862e5c7bf 100644
--- a/src/tools/moc/moc.qbs
+++ b/src/tools/moc/moc.qbs
@@ -7,7 +7,7 @@ QtHostTool {
     createQbsModule: true
     useBootstrapLib: true
 
-    Depends { name: "QtCoreHeaders" }
+    Depends { name: "Qt.core_headers" }
 
     cpp.defines: base.concat(["QT_NO_COMPRESS"])
 
diff --git a/src/widgets/widgets.qbs b/src/widgets/widgets.qbs
index 56fe03d41e..165b84cc01 100644
--- a/src/widgets/widgets.qbs
+++ b/src/widgets/widgets.qbs
@@ -25,7 +25,7 @@ QtModuleProject {
             project.qtbaseShadowDir + "/src/widgets/qtwidgets-config.h",
             project.qtbaseShadowDir + "/src/widgets/qtwidgets-config_p.h",
         ]
-        Depends { name: "QtGuiHeaders" }
+        Depends { name: "Qt.gui_headers" }
     }
 
     QtPrivateModule {
@@ -43,7 +43,7 @@ QtModuleProject {
 
         Depends { name: "Qt.core_private" }
         Depends { name: "Qt.gui_private" }
-        Depends { name: "QtPlatformHeaders" }
+        Depends { name: "Qt.platform_headers" }
         Depends { name: "uic" }
         Depends { name: project.headersName }