diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2018-04-29 22:35:13 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-03 09:23:47 +0000 |
| commit | 864d50be79752ef3cadd47118f24905ecb057626 (patch) | |
| tree | c6e157caea1aa369a8492b5541cd71d89f223932 | |
| parent | fddf7ee536e4fd0061d0ee933707881cebe54223 (diff) | |
| download | qttools-864d50be79752ef3cadd47118f24905ecb057626.tar.gz | |
Disable QDoc on MinGW
These two changes broke QDoc build on MinGW:
"Link qdoc to static libclang" (fddf7ee536e4fd0061d0ee933707881cebe54)
"Update clang version to 6.0" (c5ddbdb86b837fcdd406d12e66d8193c991bde)
To get Qt 5.11.0 release out in time we need take a shortcut and
disable the QDoc build. We agreed that qdoc binary will not be provided
on mingw530.
Task-number: QTBUG-66015
Change-Id: I25c6014754c58bc3202af645ef77ebc8bfaf1291
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | mkspecs/features/qt_find_clang.prf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/features/qt_find_clang.prf b/mkspecs/features/qt_find_clang.prf index 17d18a5fb..e39e39a3f 100644 --- a/mkspecs/features/qt_find_clang.prf +++ b/mkspecs/features/qt_find_clang.prf @@ -40,6 +40,13 @@ defineReplace(findLLVMVersionFromLibDir) { } for(_, $$list(_)) { # just a way to break easily + isEmpty(FORCE_MINGW_QDOC_BUILD): FORCE_MINGW_QDOC_BUILD = $$(FORCE_MINGW_QDOC_BUILD) + mingw : isEmpty(FORCE_MINGW_QDOC_BUILD) { + log("QDoc build is disabled on MinGW in Qt 5.11.0, because of a missing feature in the release infrastructure.") + log("You can enable it by setting FORCE_MINGW_QDOC_BUILD") + break() + } + isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$(LLVM_INSTALL_DIR) LLVM_INSTALL_DIR = $$clean_path($$LLVM_INSTALL_DIR) contains(QMAKE_HOST.arch, x86_64): \ |