Commit Graph

5 Commits

Author SHA1 Message Date
Simon Hausmann 9159a7c3db Fix debug-and-release builds with CONFIG += qtquickcompiler
Allow for QMLCACHE_DIR to be pre-defined when modified with debug or
release suffix via exclusive_builds_post.prf.

Task-number: QTBUG-66675
Change-Id: I007fd8359a860e4c7c2b3efdd90a678ddaad72c3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-03-31 13:32:09 +00:00
Simon Hausmann 5b1538d1c0 Fix use of CONFIG+=qtquickcompiler with spaces in paths
Add strategic calls to system_quote and shell_quote and correct the
output list iteration to not use $$list, as that will end up splitting
on spaces in the path.

Task-number: QTBUG-67011
Change-Id: I31dbee537e2052ac7b802ee3509a74c9db3b8beb
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-03-14 14:12:43 +00:00
Samuli Piippo f6e8dfb823 Use qmlcachegen path from qtPrepareTool
Full path is already resolved by qtPrepareTool.

Change-Id: If4232d247f64ffde85ce5ebe7bea8ab77d5bf32e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-08 08:11:34 +00:00
Simon Hausmann 6ef66a5dfe Remove private API dependency of qmlcachegen generated code
Since the compilation unit does not have a backend anymore, we can
create it in QtQml itself instead of in generated stub code. That
removes the last dependency to private headers in the generated code.

Change-Id: I186fc5bd679476b1a4714e4e3ba0ac00b55676cf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-01-28 16:37:30 +00:00
Simon Hausmann e5b157275d Add support for compiling QML/JS files ahead of time in resources
This is bringing over the loading infrastructure from the Qt Quick
Compiler that allows embedding qml/js files in resources and compiling
them ahead of time.

At the moment, the approach of generating one cpp file per qml/js file
and the loader stub is needed because the build system does not support
dynamic resource generation. In addition, as per QTBUG-60961, we must
ensure that the generated data structures are aligned.

To retain compatibility this is enabled via CONFIG += qtquickcompiler,
but we may need to find a new name (but should keep the old one in any
case).

Task-number: QTBUG-60961
Change-Id: Ia9839bf98d3af4c50636b6e06815364a9fc7ee57
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-01-28 16:37:26 +00:00