forked from qt-creator/qt-creator
QmlJS: Tr::Tr
Excluding the Qml parser, which needs to remain in sync with it's copy in Qt. Change-Id: I22f475f265dd74687e3239c4d6916c777798a447 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -2,14 +2,17 @@
|
||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||
|
||||
#include "parser/qmljsast_p.h"
|
||||
|
||||
#include "qmljsinterpreter.h"
|
||||
|
||||
#include "qmljsconstants.h"
|
||||
#include "qmljscontext.h"
|
||||
#include "qmljsevaluate.h"
|
||||
#include "qmljsinterpreter.h"
|
||||
#include "qmljsmodelmanagerinterface.h"
|
||||
#include "qmljsscopeastpath.h"
|
||||
#include "qmljsscopebuilder.h"
|
||||
#include "qmljsscopechain.h"
|
||||
#include "qmljstr.h"
|
||||
#include "qmljstypedescriptionreader.h"
|
||||
#include "qmljsvalueowner.h"
|
||||
|
||||
@@ -1340,13 +1343,11 @@ CppQmlTypesLoader::BuiltinObjects CppQmlTypesLoader::loadQmlTypes(const QFileInf
|
||||
error = file.errorString();
|
||||
}
|
||||
if (!error.isEmpty()) {
|
||||
errors->append(TypeDescriptionReader::tr(
|
||||
"Errors while loading qmltypes from %1:\n%2").arg(
|
||||
errors->append(Tr::tr("Errors while loading qmltypes from %1:\n%2").arg(
|
||||
qmlTypeFile.absoluteFilePath(), error));
|
||||
}
|
||||
if (!warning.isEmpty()) {
|
||||
warnings->append(TypeDescriptionReader::tr(
|
||||
"Warnings while loading qmltypes from %1:\n%2").arg(
|
||||
warnings->append(Tr::tr("Warnings while loading qmltypes from %1:\n%2").arg(
|
||||
qmlTypeFile.absoluteFilePath(), warning));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user