aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-12-05 16:39:29 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-12-05 21:02:57 +0000
commit5c94c37ae86d97d7a107bc1627d519bfbc7dd450 (patch)
treed4336aeddede6751d5a0f34d2c537752e9bfed44
parent8c8257249fe322cbb32074757eb3a30a5164f9e1 (diff)
Revert "Build: install the metatypes inside Qt's own arch-specific data dir"
The change does not qualify for a patch release. This reverts commit ec57a5763dc5d60aab45b4a861f19c1df108175c. Change-Id: I7ef0a0b347cc313da8f379b6f044189be0f29e50 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 9451f5a8aed07236d618c7946ebbb6275013eaa1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qmltyperegistrar/qmltypes.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf
index 8011a758fb..b6dea810cc 100644
--- a/src/qmltyperegistrar/qmltypes.prf
+++ b/src/qmltyperegistrar/qmltypes.prf
@@ -67,7 +67,7 @@ for(dep, qt_module_deps) {
} else {
metatypes_filename = $$lower($$replace($${infixed_module_name}, $$QT_LIBINFIX, ''))$${ABI}_$${build_type}_metatypes.json
}
- metatypes_filepath = $$[QT_INSTALL_ARCHDATA]/metatypes/$${metatypes_filename}
+ metatypes_filepath = $$[QT_INSTALL_LIBS]/metatypes/$${metatypes_filename}
exists($${metatypes_filepath}) {
QML_FOREIGN_METATYPES += $${metatypes_filepath}
break()