Commit Graph

10 Commits

Author SHA1 Message Date
Kai Köhne c442542627 Move tools to libexec
Move qmlimportscanner, qmltyperegistrar, qmljsrootgen, qmlcachegen to libexec
These are internal tools that is not supposed to be run by the user directly.

[ChangeLog][Linux] qmlimportscanner, qmltyperegistrar, qmljsrootgen,
qmlcachegen tools got moved from QTDIR/bin into QTDIR/libexec
directory.

Task-number: QTBUG-88791
Change-Id: I2739044e872ec83ef7da7dd857c26395ecfd407d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2021-05-11 08:48:11 +02:00
Simon Hausmann 1ab5d14615 Minor data structure cleanup
The cache files are architecture and ABI independent, so we can remove
any associated field/code as well as the workaround for Android.

Change-Id: Ia52a5be886fc22a2105460e003e7a76af7dc1818
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-01-22 09:21:38 +00:00
J-P Nurmi 93ad68de3a Fix build for QML modules with qmlcache config enabled
Since we're now storing bytecode in the cache, the --check-if-supported
option doesn't make sense anymore. Return EXIT_SUCCESS for backwards
compatibility. qmlcache.prf no longer needs the system call either.

Change-Id: Ic3e6de4e404a3d255b57d4bc14e1206c528925a8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-08 16:25:06 +00:00
Simon Hausmann d8f84e5769 Disable ahead-of-time cache generation on Android
It appears that not all phones are happy with the code that we generate.
Until we can find a fix for that, let's disable the feature.

Change-Id: If4aa5cc14edcb69843fb9ef32691657c8c507b83
Task-number: QTBUG-60918
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2017-06-06 11:15:23 +00:00
Simon Hausmann fcb9a74078 Fix loading of ahead-of-time generated cache files when cross-compiling
The target ABI is something that we must include correctly at cache
generation time. The corresponding qmake variable is available in qtbase
now, so we can use that and embed it in the generated data.

Change-Id: Icd6e44824f5151535ce9ddac27687b7877288725
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-04-06 08:14:52 +00:00
Simon Hausmann ec4c2e640d Fix cache file generation for prefix and shadow builds
For prefix builds generate the cache files in $$MODULE_BASE_OUTDIR/qml/
and install them from there.

The use of relative paths for the qml cache extra compiler output is
required because target_predeps in the extra compiler configuration will
generate relative paths as dependency for the target.

Task-number: QTBUG-58570
Change-Id: I6eedfd2aca1b0bdc7a230ce7521e499c6ab70ee0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-03-09 08:19:32 +00:00
Simon Hausmann ba6de61acd Fix skipping of qml cache generation on unsupported architectures
Detect support for the target architecture at qmake time and gently
skip the process.

Change-Id: I7cc22a0cfb9a8b503c182062a56e506035f84fa2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-03-07 07:06:44 +00:00
Simon Hausmann 38919dc825 Fix qml cache generation for non-prefix builds
Generate cache files right in the target locatioa, similar to how
qml_module.prf uses COPIES to copy .qml source files to the target
location in non-prefix builds.

Change-Id: I06f6112c29ffd212e29a84e29418d042255b5861
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-03-06 17:21:50 +00:00
Simon Hausmann 835f8a9038 Allow selecting armv7 as target architecture in qmlcachegen
Change-Id: I36e8f95e83ea3de6553145efc762e3bc46f60071
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-02-01 11:52:40 +00:00
Simon Hausmann 27c678cea6 Added tool to generate QML cache files
This is an initial preview that will allow generating cache files ahead
of time, with some limitations:

* There's no support for import dependency resolution
* Only ARMv7 is supported as cross-compile target

Change-Id: I894237f55ba0c0a71f0ed5dda2ff6f7e5bd6603e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-01-31 17:09:15 +00:00