diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-01-22 09:40:52 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-01-22 09:21:38 +0000 |
| commit | 1ab5d14615f713a87141b66675521d702542d3a6 (patch) | |
| tree | 83ab229fbbd08d39cfb4637240008bf012c10491 /tools/qmlcachegen/qmlcache.prf | |
| parent | f562a7d99aeaff85f964b0ad75f94fb85e3ddd11 (diff) | |
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>
Diffstat (limited to 'tools/qmlcachegen/qmlcache.prf')
| -rw-r--r-- | tools/qmlcachegen/qmlcache.prf | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf index dfb06cb760..537eaf62ea 100644 --- a/tools/qmlcachegen/qmlcache.prf +++ b/tools/qmlcachegen/qmlcache.prf @@ -3,23 +3,10 @@ static { return() } -android { - message("QML cache generation ahead of time is not supported on Android") - return() -} - qtPrepareTool(QML_CACHEGEN, qmlcachegen, _ARCH_CHECK) isEmpty(TARGETPATH): error("Must set TARGETPATH (QML import name) for ahead-of-time QML cache generation") -!isEmpty(QT_TARGET_ARCH):QML_CACHEGEN_ARCH=$$QT_TARGET_ARCH -else:QML_CACHEGEN_ARCH=$$QT_ARCH - -!isEmpty(QT_TARGET_BUILDABI):QML_CACHEGEN_ABI=$$QT_TARGET_BUILDABI -else:QML_CACHEGEN_ABI=$$QT_BUILDABI - -QML_CACHEGEN_ARGS=--target-architecture=$$QML_CACHEGEN_ARCH --target-abi=$$QML_CACHEGEN_ABI - load(qt_build_paths) prefix_build: QMLCACHE_DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH @@ -45,7 +32,7 @@ qmlcacheinst.CONFIG = no_check_exist qmlcachegen.input = CACHEGEN_FILES qmlcachegen.output = ${QMAKE_FUNC_FILE_IN_qmlCacheOutputFileName} qmlcachegen.CONFIG = no_link target_predeps -qmlcachegen.commands = $$QML_CACHEGEN $$QML_CACHEGEN_ARGS -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} +qmlcachegen.commands = $$QML_CACHEGEN -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} qmlcachegen.name = Generate QML Cache ${QMAKE_FILE_IN} qmlcachegen.variable_out = GENERATED_FILES |