Skip to content
Permalink
Browse files
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>
  • Loading branch information
ossilator committed Sep 29, 2016
1 parent 0f503e3 commit a7ddef139415f74f9ba8dc84a2f15105149ca5e8
Showing with 8 additions and 5 deletions.
  1. +7 −0 doc/doc.pro
  2. +1 −5 qtbase.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
@@ -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 \

0 comments on commit a7ddef1

Please sign in to comment.