diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-11 13:35:17 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-11 15:36:18 +0100 |
| commit | 673038ebd5c4ec3a15287e2f7ac80515988fddd3 (patch) | |
| tree | e6a43a645c64dd25fccf9a23afa11c394462cc4d /mkspecs/features | |
| parent | c08b0cec2f3acc29e86beba4b1de26caf04bebfd (diff) | |
metatypes: Only load qt_build_paths if we need them
Otherwise this fails for user projects.
Fixes: QTBUG-82038
Change-Id: I01bae2aab28bcedf745d1c5ae6932659ed4a7ed5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/metatypes.prf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/features/metatypes.prf b/mkspecs/features/metatypes.prf index 59ef914f63..555269fa68 100644 --- a/mkspecs/features/metatypes.prf +++ b/mkspecs/features/metatypes.prf @@ -1,7 +1,5 @@ qtPrepareTool(MOC_COLLECT_JSON, moc) -load(qt_build_paths) - QMAKE_MOC_OPTIONS += --output-json MOC_JSON_H_BASE = $${QMAKE_H_MOD_MOC} @@ -39,6 +37,7 @@ install_metatypes { do_install_metatypes.path = $$[QT_INSTALL_LIBS]/metatypes do_install_metatypes.files = $$OUT_PWD/$$MOC_COLLECT_JSON_OUTPUT prefix_build { + load(qt_build_paths) !isEmpty(MODULE_BASE_OUTDIR) { metatypes_to_builddir.files = $$do_install_metatypes.files metatypes_to_builddir.path = $$MODULE_BASE_OUTDIR/lib/metatypes |