summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/resources_functions.prf
Commit message (Collapse)AuthorAgeFilesLines
* Fix condition that adds resources for each Android ABIAlexey Edelev2021-04-071-6/+4
| | | | | | | | | | | | | | If we already have the list of Android ABI in BUILDS, it's not necessary to generate extra resource while Qt build. Amends: 58556afb6960b442f88649b550aaec8e1a04338b Pick-to: 6.0 Pick-to: 6.1 Pick-to: 5.15 Fixes: QTBUG-88031 Change-Id: I344efe6c477461659a360281da59c4abeae18fc2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix a typo in resources_functions.prfTasuku Suzuki2021-03-161-1/+1
| | | | | Change-Id: I38b81ba63612bd90b0a70f6b0c468667581b3c11 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix the qmake error when building with qtquickcompiler for iOSAlexey Edelev2021-02-181-3/+5
| | | | | | | | | | | | | | | Fix condition when adding qmake_immediate to resources. This condition was wrongly positive in any non-android case, but also had to check for BUILD emptiness or build_pass. This cause issue because qmake_qmake_immediate was added to the RESOURCES variable earlier, than actually generated. Fixes: QTBUG-88031 Pick-to: 6.0 Pick-to: 6.1 Pick-to: 5.15 Change-Id: I38dad858a7e81ab709e622ec24baa8f9b80970fa Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* resources_function.prf: Discard external path prefixesMaximilian Goldstein2020-11-101-0/+6
| | | | | | | | | | | qtdeclarative's QtQml module adds a dynamically generated qmldir file to its RESOURCES which is located outside the source directory. Previously this caused qmake to generate an invalid alias for the qmldir file. Now the relative path is discarded properly. Fixes: QTBUG-88204 Change-Id: Ia689d9d110db092cee595bf44fcbb6d57783fded Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: Fix RESOURCES for Android MultiAbIBogDan Vatra2020-05-221-1/+1
| | | | | | Pick-to: 5.15 Change-Id: I57560f51115ae560e3133096f402c6c9735f15a6 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Android: Make sure that it can find qrc files created via the pro fileAndy Shaw2020-02-101-4/+12
| | | | | | | | | | | Since Android will place the created qrc files in their own architecture then we need to make sure that we account for this when returning a list of all the resources. This is so that when other files are created that depend on this list, it is able to find them. Fixes: QTBUG-81477 Change-Id: I4a083c1c5c3e0aec35649cf7f5419cf3c6a75eae Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add function for initializing plugin resources for static buildsJoerg Bornemann2020-01-301-0/+45
| | | | | | | | | | Also move the setting of default RCC_DIR into qtFlattenResources as we need a valid RCC_DIR there. Fixes: QTBUG-81699 Fixes: QTBUG-81713 Change-Id: I7558d99f3aca75d2e9cad0ec89fbb0aa0758dcc7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix calls to qtFlattenResources from outside resources.prfJoerg Bornemann2019-12-101-4/+21
| | | | | | | | | | | | | The xml_escape function must be part of resources_functions.prf, and the qmake_immediate resource must not be created multiple times. Instead, create another qmake_immediate resource with a number suffix. This commit amends 577b6554. Task-number: QTBUG-79672 Change-Id: Ibbe20c0fd1940f1fe7733cd1e5b0891f65689782 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Move RESOURCE flattening code to dedicated functionJoerg Bornemann2019-11-051-0/+63
Introduce resources_functions.prf with the test function qtFlattenResources which ensures that RESOURCES has a flat structure, e.g. only contains *.qrc entries. This can be called by other .prf files like qtquickcompiler.prf without disturbing the ability to extend RESOURCES in other .prf files. Task-number: QTBUG-79672 Change-Id: I43246e40f5ea52a9d9c917a1bd781aeeb1304acc Reviewed-by: Kai Koehne <kai.koehne@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 11:05:29 +0000