diff options
| author | Niels Weber <niels.weber@digia.com> | 2014-12-01 09:06:23 +0100 |
|---|---|---|
| committer | Niels Weber <niels.weber@theqtcompany.com> | 2014-12-01 09:51:29 +0100 |
| commit | bccdcf3612f3225008ab246b8055754c56625baa (patch) | |
| tree | 71208b911dd5b54fc2d602c37573cf7a1b3d0070 /src | |
| parent | 19549b3b0f224db1bcf164139533473486d61b1c (diff) | |
Fixed wrong fix in 19549b3b0f224db1bcf164139533473486d61b1c
Some places needed scScript, not scScriptTag
Change-Id: Ib18e3b1c2c446765120da5ebe117874bcd36e0a4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/component.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 476d869fe..3d83d939d 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(scScriptTag); + 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(scScriptTag, 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(scScriptTag, Qt::CaseInsensitive) == 0) { + if (d->m_vars.value(scDefault).compare(scScript, Qt::CaseInsensitive) == 0) { QJSValue valueFromScript; try { valueFromScript = d->scriptEngine()->callScriptMethod(d->m_scriptContext, |