summaryrefslogtreecommitdiffstats
path: root/configure.json
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Exclude assistant from build"Kai Koehne2020-11-231-6/+6
| | | | | | | | | | This reverts commit 7aeec24a9b8c00ee56891e4037406eca8271aa4d. Reason for revert: See discussion in QTBUG-86746 Pick-to: 6.0.0 6.0 Change-Id: I9e9cc95513a1b9b3685b10b262ae2ee7334caf69 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Exclude assistant from buildJarek Kobus2020-11-051-6/+6
| | | | | | | Task-number: QTBUG-86746 Tash-number: QTBUG-88123 Change-Id: Ia086ab9a7c193e7829ef886929dc921432f67a1b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* CMake: Do not recommend using llvm-config anymoreKai Koehne2020-09-241-3/+2
| | | | | | | | | | cmake/FindWrapLibClang.cmake does automatically prepend environment variable and CMake variable LLVM_INSTALL_DIR to CMAKE_PREFIX_PATH. So let's document that. Change-Id: I73828e454676571beebcdc4eda3223f18824ecaa Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Remove makeqpfEskil Abrahamsen Blomfeldt2020-08-201-6/+0
| | | | | | | | | The QPF2 file format is no longer supported in Qt since Qt 6, so we no longer need the tool to generate it. Change-Id: I5c0131fa616f7255ca57a00d84f61f221843d869 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Remove winrt specific codeOliver Wolff2020-08-061-9/+2
| | | | | | | | Task-number: QTBUG-84434 Change-Id: I9c3a661e490f3dccea893e213939953465d8970e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAlexandru Croitor2020-04-151-2/+162
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Add configure features for remaining qttoolsMitch Curtis2020-03-181-0/+111
| | | | | | | | | | | | | | | | | | | | | | I only need qdoc from qttools, but building the other tools takes up quite a bit of time. qdoc already has a configure feature, so account for the rest of them. Change-Id: I0fc60393a1841229025c42b83d06f01668eb2680 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | lupdate: check for clang in environmentLucie Gérard2019-09-191-1/+1
|/ | | | | | | | | | | | | | | | | | | | The configure.pri and configure.json files, originally located in qttools/src/qdoc, are moved to qttools/global. This makes the clang environment accessible to both qdoc and lupdate. Both files are adapted to the need of the new lupdate clang-based parser. (see https://wiki.qt.io/Lupdate_clang-based_c%2B%2B_parser#Clang-environment_and_Qt_configuration for details) Note: If the clang environment is not adapted to the upcoming lupdate clang-based parser, nothing will break, the new parser option will simply not be available. Nothing is changing for qdoc. Change-Id: I7297f5894ba7aee669865b0e89aaa298b311e07e Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Port qdoc's libclang detection to the configure systemSimon Hausmann2018-12-121-0/+5
This is just an initial rough port with a custom config detection. More things can be refined in the future, for example turning libclang into a library to be used with QMAKE_USE. Fixes: QTBUG-72259 Change-Id: Iaf3c42f76b79bdfd07476173c2fd0f4060c11fea Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 17:12:01 +0000