diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-26 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-26 01:00:08 +0100 |
| commit | 226533fd85f8c2a2a8ac1f4abde4a34cb2221f75 (patch) | |
| tree | 867f6528fa68e20ce8c4cdb83e7637eb772fd123 /mkspecs | |
| parent | 462c2745a5168a5b57381d05779b5d16aebe018e (diff) | |
| parent | 3c4078ca02cc438dbe668c4a3819d54134ac75b5 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iad459349ea8b4090d79b4771bfff8f656a8a8189
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_build_config.prf | 5 |
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. |