aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Fix handling of empty qrc files with qtquickcompilerAlexandru Croitor2022-02-081-3/+8
| | | | | | | | | | | | | | | | | | Don't run rcc on empty qrc files. If the output of running rcc --list at configure time was empty, than we shouldn't call qt5_add_resources on the list of filetered rcc files because they will also be empty. Revert the maOS ARM skipping of the test now that the underlying issue is fixed. As a drive-by, fix main.qml file size check in main.cpp. If the file is successfully embedded, it shouldn't have a 0 size. Amends eb1f9c2e687002643ebc80e51d4bfc5f0258da0d Task-number: QTBUG-99362 Change-Id: I57dfaf1edbe5b26d051aed604703b2c7640dc4e2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Fix OPTIONS argument of qtquick_compiler_add_resourcesJoerg Bornemann2020-10-211-1/+1
| | | | | | | | | | The OPTIONS argument is stored in the variable rcc_options, not options. Pick-to: 5.12 Fixes: QTBUG-87721 Change-Id: Ibd04ada18461fa1c052be46f3c7aa9cb28f31e8f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Add cmake directory dependency for .rcc files process by qmlcachegenUlf Hermann2020-07-041-0/+1
| | | | | | | | | This is necessary to trigger a re-configuration if any of those changes. Fixes: QTBUG-85190 Change-Id: I9a9987533976664d5c382663c52f13a2933a167b Reviewed-by: Evgeniy Dushistov <dushistov@mail.ru> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QtQuickCompiler: list rcc file as dependency of generated filesUlf Hermann2020-07-031-1/+4
| | | | | | | | | | | | Otherwise the resources will not be re-processed if something is added or removed to/from the .rcc file. This does not affect Qt6 as there all QML files are automatically compiled and qtquick_compiler_add_resources does not exist anymore. Fixes: QTBUG-85190 Change-Id: Iadae47900e0213acfbf241a29307f2d40bcfe7f9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix regression when using CONFIG+=QtQuickCompiler and .qrc files in subdirsSimon Hausmann2019-09-191-1/+1
| | | | | | | | | | | | | | | | | | Commit 41864db3b61d9e81a9fe4906918d2cd3d6d32a0c removed the processing of .qrc files that removed .qml/etc. files. Since the chaining of resources remains critical to ensure that the cached compilation units are loaded, the build system copied the input .qrc file to a new one. That mere copying caused the build to break when the copied .qrc file was not in the same directory as the original one, as file paths within the .qrc file are interpreted as relative to the .qrc file, which was now in a different location. To fix this, this patch brings back the "filtering" code that rewrites the paths to the source files in the .qrc file. Fixes: QTBUG-78253 Change-Id: Ie1d56f3248e713a964260bc2da37c9374f7b6a36 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix *.js files disappearing from RESOURCES when not using QtQmlSimon Hausmann2019-09-091-7/+3
| | | | | | | | | | | | | | | | | [ChangeLog][QtQml][Important Behavior Changes] Using the Qt Quick Compiler would exclude the original .qml files from the resource system. This made it impossible to change the Qt library binary later as the program binary was tied the to the exact Qt version. In addition sometimes unrelated files (QTBUG-73669) were removed. For the latter scenario, retain and skip options were added for the Qt Quick Compiler. In Qt 5.15 the Qt Quick Compiler does not remove the input files anymore. All files are retained and the compiler merely adds the more efficient binary representation to the application. Task-number: QTBUG-73669 Change-Id: I5a523bfc69d4f48a1451bd880616c82fd73b8d15 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Don't handle empty resource filesAndy Shaw2018-12-171-10/+12
| | | | | | | | [ChangeLog][Qml] Empty resource files will not be passed to Qt Quick Compiler to be handled when using CMake. Change-Id: I1513d29b70d8a4b08a2947f4a97fbd525c5ace8f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add support for compiling ES modules ahead of timeSimon Hausmann2018-08-171-1/+2
| | | | | | | | | | | | This is also pretty straight-forward by adding .mjs as supported extension in the qmake and cmake support. This also tweaks qv4engine.cpp to share the same module compilation function across all code paths. Change-Id: Ia0e23c78a794f2330ecf8f991ee6ea948f4ac89d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix qtquick_compiler_add_resources when cross-compilingSimon Hausmann2018-07-031-0/+87
Attempt to locate the qmlcachegen binary in the host bin directory if possible. Task-number: QTBUG-68724 Change-Id: If0d28408a316b3dd33f4734464e0d5fe44c9fc2c Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 13:16:39 +0000