···

       
1
       
-
       
Partially reverts <https://codereview.qt-project.org/#/c/140954/>.

     

       
2
       
-
       


     

       
3
       
-
       
diff --git i/mkspecs/features/qt_module.prf w/mkspecs/features/qt_module.prf

     

       
4
       
-
       
index bb28af97..36bb6483 100644

     

       
5
       
-
       
--- i/mkspecs/features/qt_module.prf

     

       
6
       
-
       
+++ w/mkspecs/features/qt_module.prf

     

       
7
       
-
       
@@ -245,7 +245,7 @@ load(qt_installs)

     

       
8
       
 
       
 load(qt_targets)

     

       
9
       
-
       


     

       
10
       
 
       
 # this builds on top of qt_common

     

       
11
       
 
       
-!internal_module:!lib_bundle:if(unix|mingw) {

     

       
12
       
 
       
+!internal_module:if(unix|mingw) {

     

       
13
       
 
       
     CONFIG += create_pc

     

       
14
       
 
       
     QMAKE_PKGCONFIG_DESTDIR = pkgconfig

     

       
15
       
-
       
     host_build: \
     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
1
       
+
       
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf

     

       
2
       
+
       
index e6a0d97f1a..b50ce77d51 100644

     

       
3
       
+
       
--- a/mkspecs/features/qt_module.prf

     

       
4
       
+
       
+++ b/mkspecs/features/qt_module.prf

     

       
5
       
+
       
@@ -266,7 +266,7 @@ load(qt_installs)

     

       
0
       
 
       

     

       
0
       
 
       

     

       
6
       
 
       
 load(qt_targets)

     

       
7
       
+
       
 

     

       
8
       
 
       
 # this builds on top of qt_common

     

       
9
       
 
       
-!internal_module:!lib_bundle:if(unix|mingw) {

     

       
10
       
 
       
+!internal_module:if(unix|mingw) {

     

       
11
       
 
       
     CONFIG += create_pc

     

       
12
       
 
       
     QMAKE_PKGCONFIG_DESTDIR = pkgconfig

     

       
13
       
+
       
     host_build: \

     

       
14
       
+
       
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf

     

       
15
       
+
       
index 62b88c6fe2..f302f1e202 100644

     

       
16
       
+
       
--- a/mkspecs/features/qt_module_headers.prf

     

       
17
       
+
       
+++ b/mkspecs/features/qt_module_headers.prf

     

       
18
       
+
       
@@ -102,8 +102,7 @@ git_build: \

     

       
19
       
+
       
 else: \

     

       
20
       
+
       
     INC_PATH = $$MODULE_BASE_INDIR

     

       
21
       
+
       
 include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true)

     

       
22
       
+
       
-!lib_bundle: \  # Headers are embedded into the bundle, so don't install them separately.

     

       
23
       
+
       
-    CONFIG += qt_install_headers

     

       
24
       
+
       
+CONFIG += qt_install_headers

     

       
25
       
+
       
 

     

       
26
       
+
       
 alien_syncqt: return()

     

       
27
       
+