diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-09-27 13:43:55 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-09-29 13:44:20 +0000 |
| commit | a7ddef139415f74f9ba8dc84a2f15105149ca5e8 (patch) | |
| tree | 9ab6a453a72a992a0768b7969cc5bf0d202cd146 | |
| parent | 0f503e3bb9a047b68bd9c4b1ca4ca89b58d24d63 (diff) | |
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>
| -rw-r--r-- | doc/doc.pro | 7 | ||||
| -rw-r--r-- | qtbase.pro | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/doc.pro b/doc/doc.pro new file mode 100644 index 0000000000..41ceb7ceae --- /dev/null +++ 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 index 98ca86ad58..78f9b3a86c 100644 --- 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 \ |