summaryrefslogtreecommitdiffstats
path: root/configure.pri
Commit message (Collapse)AuthorAgeFilesLines
* qttools: Proper detect Windows for llvm/clangCristian Adam2020-08-121-2/+2
| | | | | | | | | | In qmake code win32 doesn't catch the case when running as a host tool on Windows, thus skipping important bits. This fixes libclang linking errors for qdoc. Change-Id: I63db578e03877b91feb6f8d50ee1fee215f9ad3c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QDoc: Upgrade building with Clang 10Cristian Adam2020-06-221-197/+88
| | | | | | | | | | | | | | Change the right configure.pri for qdoc. Remove stale src/qdoc/configure.pri file. It is known to work with static LLVM/Clang builds from https://download.qt.io/development_releases/prebuilt/libclang/qt/ which requires the environment variable QDOC_USE_STATIC_LIBCLANG to be set to 1. Ammends d9dc6dddb49439900695a5000e6ad19c935a535e Change-Id: Ic08fb7a59e016c63b35be8ff3acf39702c367793 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAlexandru Croitor2020-04-151-0/+543
Conflicts: a bunch of .pro and configure.json file adjustments and some conflicting cherry-picks from dev -> 5.15 that are merged into dev again src/assistant/assistant/main.cpp Change-Id: I174c00b6a300c6d46c4e081bdcb2f15f23ae9ef2