copy global qdoc config files in non-prefix shadow builds

that required factoring out the docs installation to a separate project, as COPIES doesn't work in subdirs projects. it's cleaner this way anyway. Change-Id: I594f3ecdae67417511034ab993904c962b86b282 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
sailfishos · Sep 29, 2016 · a7ddef1 · a7ddef1
1 parent 0f503e3
commit a7ddef1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/doc/doc.pro b/doc/doc.pro
@@ -0,0 +1,7 @@
+TEMPLATE = aux
+
+global_docs.files = $$PWD/global
+global_docs.path = $$[QT_INSTALL_DOCS]
+INSTALLS += global_docs
+!prefix_build:!equals(OUT_PWD, $$PWD): \
+    COPIES += global_docs
diff --git a/qtbase.pro b/qtbase.pro
@@ -4,7 +4,7 @@
 
 load(qt_parts)
 
-SUBDIRS += qmake/qmake-docs.pro
+SUBDIRS += qmake/qmake-docs.pro doc
 
 cross_compile: CONFIG += nostrip
 
@@ -180,10 +180,6 @@ mkspecs.files = \
 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
 INSTALLS += mkspecs
 
-global_docs.files = $$PWD/doc/global
-global_docs.path = $$[QT_INSTALL_DOCS]
-INSTALLS += global_docs
-
 OTHER_FILES += \
     configure \
     header.BSD \