diff options
| author | jkobus <jaroslaw.kobus@theqtcompany.com> | 2014-11-17 14:40:57 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2014-11-18 15:38:13 +0100 |
| commit | 41e58eb4a481c84a898858ef67d222b861717a59 (patch) | |
| tree | bf6715d26decf238e441faef829601703fc3cd3a /src/libs | |
| parent | a01ffeff2202b5e962598411c1095ea871d46c80 (diff) | |
Introduce scScript constant and use whenever needed
Change-Id: Icdbd110f4778bbf8fa75cf54a564fcd0bc8f7a49
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/installer/component.cpp | 6 | ||||
| -rw-r--r-- | src/libs/installer/constants.h | 1 | ||||
| -rw-r--r-- | src/libs/installer/uninstallercalculator.cpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 5f83b8fce..75f76c861 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -1174,7 +1174,7 @@ QStringList Component::autoDependencies() const { QStringList autoDependencyStringList = d->m_vars.value(scAutoDependOn).split(QInstaller::commaRegExp(), QString::SkipEmptyParts); - autoDependencyStringList.removeAll(QLatin1String("script")); + autoDependencyStringList.removeAll(scScript); return autoDependencyStringList; } @@ -1203,7 +1203,7 @@ bool Component::isAutoDependOn(const QSet<QString> &componentsToInstall) const return false; // The script can override this method and determines if the component needs to be installed. - if (autoDependOnList.first().compare(QLatin1String("script"), Qt::CaseInsensitive) == 0) { + if (autoDependOnList.first().compare(scScript, Qt::CaseInsensitive) == 0) { QJSValue valueFromScript; try { valueFromScript = d->scriptEngine()->callScriptMethod(d->m_scriptContext, @@ -1254,7 +1254,7 @@ bool Component::isDefault() const return false; // the script can override this method - if (d->m_vars.value(scDefault).compare(QLatin1String("script"), Qt::CaseInsensitive) == 0) { + if (d->m_vars.value(scDefault).compare(scScript, Qt::CaseInsensitive) == 0) { QJSValue valueFromScript; try { valueFromScript = d->scriptEngine()->callScriptMethod(d->m_scriptContext, diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h index 47f6eb566..3d480dd77 100644 --- a/src/libs/installer/constants.h +++ b/src/libs/installer/constants.h @@ -42,6 +42,7 @@ namespace QInstaller { // constants used throughout several classes static const QLatin1String scTrue("true"); static const QLatin1String scFalse("false"); +static const QLatin1String scScript("script"); static const QLatin1String scName("Name"); static const QLatin1String scVersion("Version"); diff --git a/src/libs/installer/uninstallercalculator.cpp b/src/libs/installer/uninstallercalculator.cpp index 7cd24ad31..1b59fd42f 100644 --- a/src/libs/installer/uninstallercalculator.cpp +++ b/src/libs/installer/uninstallercalculator.cpp @@ -93,7 +93,7 @@ void UninstallerCalculator::appendComponentsToUninstall(const QList<Component*> // This code needs to be enabled once the scripts use isInstalled, installationRequested and // uninstallationRequested... - if (autoDependencies.first().compare(QLatin1String("script"), Qt::CaseInsensitive) == 0) { + if (autoDependencies.first().compare(scScript, Qt::CaseInsensitive) == 0) { //QScriptValue valueFromScript; //try { // valueFromScript = callScriptMethod(QLatin1String("isAutoDependOn")); |