diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-05-15 11:11:32 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-05-15 11:21:44 +0200 |
| commit | 7d25b9090851d3db06bd0f91e7c3d05a80d1ca79 (patch) | |
| tree | 605ab87c25ffdbaeb6f1437b6585e55c72900996 /src/plugins/qmljstools | |
| parent | 3604bdbad29ba539bda5a4ac355838fd8554888f (diff) | |
| download | qt-creator-7d25b9090851d3db06bd0f91e7c3d05a80d1ca79.tar.gz | |
TypeDescriptionReader: Check for files that are not UTF8 encoded
We had a qmltypes file that was encoded in UTF16 and did not work.
We should at least warn about it.
Change-Id: I42555782ee16ddd25552f919845aa85ff1f3f636
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/qmljstools')
| -rw-r--r-- | src/plugins/qmljstools/qmljsplugindumper.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp index cfb47d9001..5338220afc 100644 --- a/src/plugins/qmljstools/qmljsplugindumper.cpp +++ b/src/plugins/qmljstools/qmljsplugindumper.cpp @@ -326,7 +326,8 @@ void PluginDumper::qmlPluginTypeDumpDone(int exitCode) QString warning; CppQmlTypesLoader::BuiltinObjects objectsList; QList<ModuleApiInfo> moduleApis; - CppQmlTypesLoader::parseQmlTypeDescriptions(output, &objectsList, &moduleApis, &error, &warning); + CppQmlTypesLoader::parseQmlTypeDescriptions(output, &objectsList, &moduleApis, &error, &warning, + QLatin1String("<dump of ") + libraryPath + QLatin1String(">")); if (exitCode == 0) { if (!error.isEmpty()) { libraryInfo.setPluginTypeInfoStatus(LibraryInfo::DumpError, @@ -397,7 +398,7 @@ void PluginDumper::loadQmltypesFile(const QStringList &qmltypesFilePaths, QString warning; CppQmlTypesLoader::BuiltinObjects newObjects; QList<ModuleApiInfo> newModuleApis; - CppQmlTypesLoader::parseQmlTypeDescriptions(reader.data(), &newObjects, &newModuleApis, &error, &warning); + CppQmlTypesLoader::parseQmlTypeDescriptions(reader.data(), &newObjects, &newModuleApis, &error, &warning, qmltypesFilePath); if (!error.isEmpty()) { errors += tr("Failed to parse '%1'.\nError: %2").arg(qmltypesFilePath, error); } else { |