diff options
| -rw-r--r-- | doc/installerfw.qdoc | 5 | ||||
| -rw-r--r-- | src/libs/installer/component.cpp | 5 | ||||
| -rw-r--r-- | tools/common/repositorygen.cpp | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index fb664f595..187686a9c 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -662,6 +662,11 @@ If there is some data inside the component and the package.xml and/or the script has no DownloadableArchives value, the repogen tool registers the found data automatically. + + \row + \li RequiresAdminRights + \li Set to \c true if the package needs to be installed with elevated permissions. + Optional. \endtable \section2 Component Dependencies diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 393dcd99a..e2a9cf2e1 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -940,11 +940,6 @@ void Component::addOperation(Operation *operation) */ void Component::addElevatedOperation(Operation *operation) { - if (value(scRequiresAdminRights, scFalse) != scTrue) { - qWarning() << QString::fromLatin1("Component %1 uses addElevatedOperation in the script, " - "but it does not have the needed RequiresAdminRights tag" - ).arg(name()); - } addOperation(operation); operation->setValue(QLatin1String("admin"), true); } diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index 1863286cf..0d1cd21fa 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -312,12 +312,6 @@ void QInstallerTools::copyMetaData(const QString &_targetDir, const QString &met QString::fromLatin1("Unknown error.") : value.toString())); } - // add RequiresAdminRights tag to xml if addElevatedOperation is used somewhere - if (scriptContent.contains(QLatin1String("addElevatedOperation"))) { - QDomElement element = doc.createElement(QLatin1String("RequiresAdminRights")); - element.appendChild(doc.createTextNode(QLatin1String("true"))); - } - const QString toLocation(QString::fromLatin1("%1/%2/%3").arg(targetDir, info.name, script)); copyWithException(scriptFile.fileName(), toLocation, QInstaller::scScript); } |