feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: coding style.

Browse Source 
Change-Id: Icd87c56077db1bc9be3e22e5e841ef849e81a3d2
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Marco Benelli
2016-04-20 17:01:13 +02:00
parent e0efbb1ae8
commit a2fa0f76f8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qmljs/qmljsplugindumper.cpp
View File

@@ -431,9 +431,9 @@ QString PluginDumper::buildQmltypesPath(const QString &name) const
} }
for (const PathAndLanguage &p: m_modelManager->importPaths()) { for (const PathAndLanguage &p: m_modelManager->importPaths()) {
QString moduleName(qualifiedName.replace(QLatin1Char('.'), QLatin1Char('/'))); QString moduleName = qualifiedName.replace(QLatin1Char('.'), QLatin1Char('/'));
QString moduleNameMajor(moduleName + QLatin1Char('.') + majorVersion); QString moduleNameMajor = moduleName + QLatin1Char('.') + majorVersion;
QString moduleNameMajorMinor(moduleNameMajor + QLatin1Char('.') + minorVersion); QString moduleNameMajorMinor = moduleNameMajor + QLatin1Char('.') + minorVersion;
for (const auto n: QStringList{moduleNameMajorMinor, moduleNameMajor, moduleName}) { for (const auto n: QStringList{moduleNameMajorMinor, moduleNameMajor, moduleName}) {
QString filename(p.path().toString() + QLatin1Char('/') + n QString filename(p.path().toString() + QLatin1Char('/') + n

3
src/libs/qmljs/qmljstypedescriptionreader.cpp
View File

@@ -182,7 +182,8 @@ void TypeDescriptionReader::addWarning(const SourceLocation &loc, const QString
message); message);
} }
void TypeDescriptionReader::readDependencies(UiScriptBinding *ast) { void TypeDescriptionReader::readDependencies(UiScriptBinding *ast)
{
ExpressionStatement *stmt = dynamic_cast<ExpressionStatement*>(ast->statement); ExpressionStatement *stmt = dynamic_cast<ExpressionStatement*>(ast->statement);
if (!stmt) { if (!stmt) {
addError(ast->statement->firstSourceLocation(), tr("Expected dependency definitions")); addError(ast->statement->firstSourceLocation(), tr("Expected dependency definitions"));