diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-10-12 09:28:00 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-10-12 09:30:51 +0200 |
| commit | 6c04ab6712516dd76addf35cd924ee73603dbbf3 (patch) | |
| tree | 7b96443eb972bb6e84ecb6ead777c0a3b8dc2995 /src/libs/installer/packagemanagercore_p.cpp | |
| parent | 175ffec58f9e4f513004ec53ab03f06561096913 (diff) | |
| parent | a81f19295745d081306f9417d6c45fda252fcb89 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Change-Id: Ia4c0c6766b52626798197c646043407df8de1fd6
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index e070ba87a..51ea4df38 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -1605,9 +1605,8 @@ bool PackageManagerCorePrivate::runPackageUpdater() //to have some progress for the cleanup/write component.xml step ProgressCoordinator::instance()->addReservePercentagePoints(1); - const QString packagesXml = componentsXmlPath(); // check if we need admin rights and ask before the action happens - if (!QFileInfo(installerBinaryPath()).isWritable() || !QFileInfo(packagesXml).isWritable()) + if (!QTemporaryFile(targetDir() + QStringLiteral("/XXXXXX")).open()) adminRightsGained = m_core->gainAdminRights(); const QList<Component *> componentsToInstall = m_core->orderedComponentsToInstall(); |