diff options
author | Liang Qi <liang.qi@qt.io> | 2020-05-15 09:01:29 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-05-15 09:01:29 +0200 |
commit | 0ae26f8c574411cbab748128a317cc08dafe2382 (patch) | |
tree | 41437d5d0ff7cc714ff37be23b25ca7ce6b792a6 /src/qmltyperegistrar | |
parent | d4042c8cd82b35b3ec67c4309d80c9c92f55d889 (diff) | |
parent | 3ed33ec74b70bbac016dd080889bb3df3a78d90c (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: If1868d27ea40fdc206971c2f7a24e91c5e62b1bf
Diffstat (limited to 'src/qmltyperegistrar')
-rw-r--r-- | src/qmltyperegistrar/qmltypes.prf | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf index 0d5a6ded24..4b112351ec 100644 --- a/src/qmltyperegistrar/qmltypes.prf +++ b/src/qmltyperegistrar/qmltypes.prf @@ -85,13 +85,25 @@ qmltyperegistrar_qmltypes.CONFIG = no_link qmltyperegistrar_qmltypes.commands = $$escape_expand(\\n) # force creation of rule install_qmltypes { - isEmpty(QMLTYPES_INSTALL_DIR): \ - QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/$$TARGETPATH - do_install_qmltypes.files = $$OUT_PWD/$$QMLTYPES_FILENAME - do_install_qmltypes.path = $$QMLTYPES_INSTALL_DIR - do_install_qmltypes.CONFIG += no_check_exist - prefix_build: INSTALLS += do_install_qmltypes - else: COPIES += do_install_qmltypes + INSTALL_QML_FILES = false + + android { + build_pass { + isEmpty(ANDROID_ABIS): ANDROID_ABIS = $$ALL_ANDROID_ABIS + ABI = $$first(ANDROID_ABIS) + equals(ABI, $$QT_ARCH): INSTALL_QML_FILES = true + } + } else: !debug_and_release|!build_all|CONFIG(release, debug|release): INSTALL_QML_FILES = true + + equals(INSTALL_QML_FILES, true) { + isEmpty(QMLTYPES_INSTALL_DIR): \ + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/$$TARGETPATH + do_install_qmltypes.files = $$OUT_PWD/$$QMLTYPES_FILENAME + do_install_qmltypes.path = $$QMLTYPES_INSTALL_DIR + do_install_qmltypes.CONFIG += no_check_exist + prefix_build: INSTALLS += do_install_qmltypes + else: COPIES += do_install_qmltypes + } } QMAKE_EXTRA_COMPILERS += qmltyperegistrar_compiler qmltyperegistrar_qmltypes |