aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltyperegistrar/qmltypes.prf
Commit message (Collapse)AuthorAgeFilesLines
* qmltypes.prf: Take abi into account for *_metatypes.json file namesAlessandro Portale2020-11-261-1/+2
| | | | | | | | | | | | | The lib/metatypes/*_metatypes.json file names contain the ABI. When constructing the qmltyperegistrar command, the right file names with that ABI part need to be passed as "foreign-types". Fixes: QTBUG-85888 Fixes: QTBUG-87117 Change-Id: I20daac1b6b9a27c5ac48b3c2c685e2fed301e213 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit acc5e48a90d0daeccb28175b80ab6b52cac5d84a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmltyperegistrar: Add past-major-version optionMaximilian Goldstein2020-11-101-0/+4
| | | | | | | | Adds the option to specify past major versions of modules to be registered. This is necessary for modules that don't export any types themselves to work when built statically. Change-Id: I4b4a379f92707ec64cbb32f91db9d010440b95a2 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* Remove whitespace for file names generated from TARGETKai Koehne2020-06-021-3/+6
| | | | | | | Task-number: QTBUG-84492 Pick-to: 5.15 Change-Id: Ieeec677634fb6d2f43ba1aeb3432a60cd5502894 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove --dependencies option from qmltyperegistrarUlf Hermann2020-05-261-3/+0
| | | | | | | | | | | We don't need to list the dependencies in the qmltypes files. The information given in the qmldir file should be enough. Ultimately, we should get rid of all hidden dependencies. Task-number: QTBUG-84286 Change-Id: Iaf67d476b449215715270043591d8c4858104ea6 Reviewed-by: Christian Kamm <mail@ckamm.de> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix parallel installation of qmltypes in a debug and release buildv5.15.0-rc2Kai Koehne2020-05-071-7/+19
| | | | | | | | | This duplicates the logic in qtbase/mkspecs/features/qml_module.prf to handle this situation (also for Android builds with multiple ABI's). Fixes: QTBUG-84019 Change-Id: I9ccbe4a3a79bb979bd6bb2758adb8c2e1ea7903e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qmltyperegistrar: Use target instead of template nameMaximilian Goldstein2020-03-261-1/+1
| | | | | | | | | Due to the fact that multiple targets may be present in the same directory we have to ensure they all get a unique qmltypes. Fixes: QTBUG-82710 Change-Id: I4d7966035644b68f7d3330a4c974369503c48bf2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* qmltyperegistrar: Accept extra foreign types filesUlf Hermann2020-03-261-5/+5
| | | | | | | | | | | If you add your own libraries with metatypes, qmake cannot determine where to look for their metatypes.json files. Add a qmake variable that allows the user to specify them. Fixes: QTBUG-82709 Change-Id: I3f5685146c134c89e541e4097ff3928de9af2aee Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmltyperegistrar: Improve resolution of module dependenciesUlf Hermann2020-01-081-2/+4
| | | | | | | | | Previously transitive private dependencies would not be resolved as resolve_depends would return a foo_private, for which we wouldn't find a Qt.$${dep}.module. Change-Id: Ie8d91d6c82c0d2f2e441a9eb662a14ef9bd82051 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* qmltyperegistrar: Fix command line optionsUlf Hermann2019-12-241-1/+1
| | | | | | | | | | | The descriptions were badly formatted, we assumed plugins.qmltypes even though we can also generate app.qmltypes and lib.qmltypes, and the --generate-qmltypes option specifies a file name, not a directory. Change-Id: Ia611198555c994ac5f5cb1ceb399fb4fc2ed780b Fixes: QTBUG-80895 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* qmltypes: Add no_check_exist to INSTALLS rule, remove no_linkUlf Hermann2019-12-231-1/+1
| | | | | | | | no_check_exist is needed to generate the rule when qmake is run before the qmltypes file exists. no_link is useless. Change-Id: I4affa277d8ff891f629ad0944e43d86d10ad3eed Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qmltyperegistrar: Search for foreign types also in MODULE_BASE_OUTDIRUlf Hermann2019-11-111-2/+11
| | | | | | | | | That's where we put the metatypes from the same module in order to be able to access them before installing. Those are generally more recent than the installed ones, therefore prefer them. Change-Id: I823ef53d9b1a39d00d6c75dde14e1942722514a7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* qmltypes.prf: Assume bare filename for QMLTYPES_FILENAMEUlf Hermann2019-11-081-3/+3
| | | | | | | | Otherwise the user has to specify for example $$OUT_PWD/plugins.qmltypes in order to generate a file with a specific name. Change-Id: I72b3c0840e35e7fde454a32663f601de1c7333ce Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Disambiguate do_install target for qmltypesUlf Hermann2019-11-081-5/+5
| | | | | | | | | qmake does pure lexical matching on those names, disregarding any scopes. Therefore, this target was the same as the do_install target in metatypes.prf. Change-Id: If06c01d7666ee1efc27d96c33cc9e0dabaa6ed80 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Move qmltyperegistrar into srcUlf Hermann2019-11-081-0/+86
We want it to be available early in the build process. qmltyperegistrar will be required to build qml, quick, and various imports. Change-Id: I15b827cd4b322a2bcea2780eeedb8dbe132aa59a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 09:55:09 +0000