diff options
| -rw-r--r-- | installerfw.pri | 2 | ||||
| -rw-r--r-- | src/libs/installer/component.cpp | 12 | ||||
| -rw-r--r-- | src/libs/installer/settings.cpp | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/installerfw.pri b/installerfw.pri index 2db2725ce..8c3f2eee2 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -110,7 +110,7 @@ CONFIG(static, static|shared) { CONFIG += depend_includepath no_private_qt_headers_warning c++11 GIT_SHA1 = $$system(git rev-list --abbrev-commit -n1 HEAD) -DEFINES += QT_NO_CAST_FROM_ASCII "_GIT_SHA1_=$$GIT_SHA1" IFW_VERSION=$$IFW_VERSION +DEFINES += QT_NO_CAST_FROM_ASCII QT_USE_QSTRINGBUILDER "_GIT_SHA1_=$$GIT_SHA1" IFW_VERSION=$$IFW_VERSION DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION static { diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index f4ea90448..6c507ad99 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -1409,11 +1409,15 @@ void Component::updateModelData(const QString &key, const QString &data) const QString &updateInfo = d->m_vars.value(scUpdateText); if (!d->m_core->isUpdater() || updateInfo.isEmpty()) { - setData(QLatin1String("<html><body>") + d->m_vars.value(scDescription) - + QLatin1String("</body></html>"), Qt::ToolTipRole); + const QString tooltipText + = QString::fromLatin1("<html><body>%1</body></html>").arg(d->m_vars.value(scDescription)); + setData(tooltipText, Qt::ToolTipRole); } else { - setData(d->m_vars.value(scDescription) + QLatin1String("<br><br>") + tr("Update Info: ") - + updateInfo, Qt::ToolTipRole); + const QString tooltipText + = d->m_vars.value(scDescription) + QLatin1String("<br><br>") + + tr("Update Info: ") + updateInfo; + + setData(tooltipText, Qt::ToolTipRole); } } diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 81972f2c2..d56d2d120 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -282,7 +282,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, if (!s.d->m_data.contains(scInstallerApplicationIcon)) s.d->m_data.insert(scInstallerApplicationIcon, s.d->m_data.value(scIcon)); if (!s.d->m_data.contains(scInstallerWindowIcon)) - s.d->m_data.insert(scInstallerWindowIcon, s.d->m_data.value(scIcon).toString() + s.systemIconSuffix()); + s.d->m_data.insert(scInstallerWindowIcon, + QString(s.d->m_data.value(scIcon).toString() + s.systemIconSuffix())); if (!s.d->m_data.contains(scRemoveTargetDir)) s.d->m_data.insert(scRemoveTargetDir, scTrue); if (!s.d->m_data.contains(scUninstallerName)) @@ -290,7 +291,7 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, if (!s.d->m_data.contains(scTargetConfigurationFile)) s.d->m_data.insert(scTargetConfigurationFile, QLatin1String("components.xml")); if (!s.d->m_data.contains(scUninstallerIniFile)) - s.d->m_data.insert(scUninstallerIniFile, s.uninstallerName() + QLatin1String(".ini")); + s.d->m_data.insert(scUninstallerIniFile, QString(s.uninstallerName() + QLatin1String(".ini"))); if (!s.d->m_data.contains(scDependsOnLocalInstallerBinary)) s.d->m_data.insert(scDependsOnLocalInstallerBinary, false); if (!s.d->m_data.contains(scRepositorySettingsPageVisible)) |