diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-07-08 16:56:22 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-07-09 13:38:42 +0000 |
commit | b2a65ce68bce4fcd4b517d1aadedb40792bfc818 (patch) | |
tree | e3685aa349abe10148c250d963723c049919b5c9 /src/libs/installer/installercalculator.cpp | |
parent | d7f53290d9a8589752b9191131dfe2b500a23511 (diff) |
Sanitize QDebug output
Prefer using the stream operator logic instead of using
QString::fromLatin1. Add a noquote() where a QString should be printed
without any quotes/escapes.
This also fixes the tests with Qt 5.5, where QString's are further
escaped.
Change-Id: Ie3afd14b9355101d3c0b52f30f66ec759c76526c
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/installercalculator.cpp')
-rw-r--r-- | src/libs/installer/installercalculator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/installer/installercalculator.cpp b/src/libs/installer/installercalculator.cpp index a03d11fc2..211190e6c 100644 --- a/src/libs/installer/installercalculator.cpp +++ b/src/libs/installer/installercalculator.cpp @@ -121,7 +121,7 @@ bool InstallerCalculator::appendComponentsToInstall(const QList<Component *> &co foreach (Component *component, components){ if (m_toInstallComponentIds.contains(component->name())) { const QString errorMessage = recursionError(component); - qWarning() << errorMessage; + qWarning().noquote() << errorMessage; m_componentsToInstallError.append(errorMessage); Q_ASSERT_X(!m_toInstallComponentIds.contains(component->name()), Q_FUNC_INFO, qPrintable(errorMessage)); @@ -173,7 +173,7 @@ bool InstallerCalculator::appendComponentToInstall(Component *component) const QString errorMessage = QCoreApplication::translate("InstallerCalculator", "Cannot find missing dependency \"%1\" for \"%2\".").arg(dependencyComponentName, component->name()); - qWarning() << errorMessage; + qWarning().noquote() << errorMessage; m_componentsToInstallError.append(errorMessage); return false; } @@ -182,7 +182,7 @@ bool InstallerCalculator::appendComponentToInstall(Component *component) && !m_toInstallComponentIds.contains(dependencyComponent->name())) { if (m_visitedComponents.value(component).contains(dependencyComponent)) { const QString errorMessage = recursionError(component); - qWarning() << errorMessage; + qWarning().noquote() << errorMessage; m_componentsToInstallError = errorMessage; Q_ASSERT_X(!m_visitedComponents.value(component).contains(dependencyComponent), Q_FUNC_INFO, qPrintable(errorMessage)); |