aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-08-31 16:46:39 +0200
committerUlf Hermann <ulf.hermann@qt.io>2021-09-04 08:45:58 +0200
commitb512d167148da14c670a4cc09ce1d3670839fdc8 (patch)
tree1b21986968ab8e08480b3538eded88fdcdc12598 /src
parenta5bb7038e56969f41646ab499815d8072ed1457b (diff)
qmltyperegistrar: Properly resolve includes for foreign types
When we add them to the qmltypes files, they need the same preprocessing as the own types. Change-Id: I3c8e946609b8a0a8f739812508b75e4f085feddc Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 226b728d92975668d1ff864ab1f3f107477aef27) Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/qmltyperegistrar/metatypesjsonprocessor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmltyperegistrar/metatypesjsonprocessor.cpp b/src/qmltyperegistrar/metatypesjsonprocessor.cpp
index 4d6f97e874..d96f75f109 100644
--- a/src/qmltyperegistrar/metatypesjsonprocessor.cpp
+++ b/src/qmltyperegistrar/metatypesjsonprocessor.cpp
@@ -317,7 +317,7 @@ void MetaTypesJsonProcessor::processTypes(const QJsonObject &types)
void MetaTypesJsonProcessor::processForeignTypes(const QJsonObject &types)
{
- const QString include = types[QLatin1String("inputFile")].toString();
+ const QString include = resolvedInclude(types[QLatin1String("inputFile")].toString());
const QJsonArray classes = types[QLatin1String("classes")].toArray();
for (const QJsonValue cls : classes) {
QJsonObject classDef = cls.toObject();