diff options
| -rw-r--r-- | src/qml/qmldirparser/qqmldirparser.cpp | 5 | ||||
| -rw-r--r-- | src/qml/qmldirparser/qqmldirparser_p.h | 14 |
2 files changed, 4 insertions, 15 deletions
diff --git a/src/qml/qmldirparser/qqmldirparser.cpp b/src/qml/qmldirparser/qqmldirparser.cpp index c4fdd70c56..0588e5bca7 100644 --- a/src/qml/qmldirparser/qqmldirparser.cpp +++ b/src/qml/qmldirparser/qqmldirparser.cpp @@ -253,8 +253,7 @@ bool QQmlDirParser::parse(const QString &source) QStringLiteral("typeinfo requires 1 argument, but %1 were provided").arg(sectionCount - 1)); continue; } - TypeInfo typeInfo(sections[1]); - _typeInfos.append(typeInfo); + _typeInfos.append(sections[1]); } else if (sections[0] == QLatin1String("designersupported")) { if (sectionCount != 1) reportError(lineNumber, 0, QStringLiteral("designersupported does not expect any argument")); @@ -391,7 +390,7 @@ QList<QQmlDirParser::Script> QQmlDirParser::scripts() const return _scripts; } -QList<QQmlDirParser::TypeInfo> QQmlDirParser::typeInfos() const +QStringList QQmlDirParser::typeInfos() const { return _typeInfos; } diff --git a/src/qml/qmldirparser/qqmldirparser_p.h b/src/qml/qmldirparser/qqmldirparser_p.h index d65b7eed85..48f808ff12 100644 --- a/src/qml/qmldirparser/qqmldirparser_p.h +++ b/src/qml/qmldirparser/qqmldirparser_p.h @@ -150,17 +150,7 @@ public: QList<Plugin> plugins() const; bool designerSupported() const; - struct TypeInfo - { - TypeInfo() = default; - TypeInfo(const QString &fileName) - : fileName(fileName) {} - - QString fileName; - }; - - QList<TypeInfo> typeInfos() const; - + QStringList typeInfos() const; QStringList classNames() const; private: @@ -176,7 +166,7 @@ private: QList<Script> _scripts; QList<Plugin> _plugins; bool _designerSupported = false; - QList<TypeInfo> _typeInfos; + QStringList _typeInfos; QStringList _classNames; }; |