summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2020-02-21 11:05:20 +0100
committerAndy Shaw <andy.shaw@qt.io>2020-02-25 18:58:17 +0100
commit2c35a6102539510bb850f587690b036d96863338 (patch)
tree9d07c639720f03043451c5e0b4aa05f37479462c /mkspecs
parentce55667b62e77902c18d9a2a62e5e323516159d7 (diff)
Delay the processing of the doc features to the end
By delaying it to the end we can be sure that all the Qt modules have their INCLUDEPATHs set and as a result we can avoid long command lines on Windows. Change-Id: I9068f7bf66fe138aad1a633191677a57dfd08d6e Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_build_config.prf5
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 8273ba3fe1..511b158b91 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -91,10 +91,13 @@ android|uikit|winrt: \
# Prevent warnings about object files without any symbols
macos: CONFIG += no_warn_empty_obj_files
+# Make sure the doc features are loaded last since they depend on other
+# features setting up things like includepaths to find everything.
+CONFIG = prepare_docs qt_docs_targets $$CONFIG
+
CONFIG += \
utf8_source \
create_prl link_prl \
- prepare_docs qt_docs_targets \
no_private_qt_headers_warning QTDIR_build \
qt_example_installs \
# Qt modules get compiled without exceptions enabled by default.