diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-01 17:08:13 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-06 11:06:30 +0200 |
| commit | 3597e83592eaac72003e16eea234866abc5102cf (patch) | |
| tree | 5af04c6c423a9a4b6f9da0592d6b0c62577831a8 /src/qmltyperegistrar/qmltypesclassdescription.cpp | |
| parent | 1a2ab822fa24733f83d6720d2af8498ecbd5cbda (diff) | |
qmltyperegistrar: Follow the private includes setting in qmltypes
If the file names need to be prepended with "private/" in order to be
usable, that also holds for other tools that want to use them.
Therefore, also add the prefix to the qmltypes files. We won't have a
chance to figure this out again at a later point.
Furthermore, don't add file entries for types we cannot register anyway.
Change-Id: If04297db419e364f472b8ec627c599c0cbb4ffd9
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmltyperegistrar/qmltypesclassdescription.cpp')
| -rw-r--r-- | src/qmltyperegistrar/qmltypesclassdescription.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmltyperegistrar/qmltypesclassdescription.cpp b/src/qmltyperegistrar/qmltypesclassdescription.cpp index c63879f4d6..7756fda9e4 100644 --- a/src/qmltyperegistrar/qmltypesclassdescription.cpp +++ b/src/qmltyperegistrar/qmltypesclassdescription.cpp @@ -62,7 +62,7 @@ void QmlTypesClassDescription::collect(const QJsonObject *classDef, const QVector<QJsonObject> &foreign, CollectMode mode) { - if (file.isEmpty()) + if (file.isEmpty() && classDef->value(QLatin1String("registerable")).toBool()) file = classDef->value(QLatin1String("inputFile")).toString(); const auto classInfos = classDef->value(QLatin1String("classInfos")).toArray(); for (const QJsonValue &classInfo : classInfos) { |