1 files changed, 23 insertions, 8 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 4a7f42621..c154edf76 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -422,9 +422,7 @@ void PackageManagerCore::writeMaintenanceTool()
             d->writeMaintenanceTool(d->m_performedOperationsOld + d->m_performedOperationsCurrentSession);
 
             bool gainedAdminRights = false;
-            QTemporaryFile tempAdminFile(d->targetDir()
-                + QLatin1String("/testjsfdjlkdsjflkdsjfldsjlfds") + QString::number(qrand() % 1000));
-            if (!tempAdminFile.open() || !tempAdminFile.isWritable()) {
+            if (!directoryWritable(d->targetDir())) {
                 gainAdminRights();
                 gainedAdminRights = true;
             }
@@ -539,6 +537,14 @@ void PackageManagerCore::componentsToInstallNeedsRecalculation()
 }
 
 /*!
+    \sa {installer::clearComponentsToInstallCalculated}{installer.clearComponentsToInstallCalculated}
+ */
+void PackageManagerCore::clearComponentsToInstallCalculated()
+{
+    d->m_componentsToInstallCalculated = false;
+}
+
+/*!
    \sa {installer::autoAcceptMessageBoxes}{installer.autoAcceptMessageBoxes}
    \sa autoRejectMessageBoxes(), setMessageBoxAutomaticAnswer()
  */
@@ -665,7 +671,7 @@ int PackageManagerCore::downloadNeededArchives(double partProgressSize)
 }
 
 /*!
-    Returns \c true if essential component update is found.
+    Returns \c true if an essential component update is found.
 */
 bool PackageManagerCore::foundEssentialUpdate() const
 {
@@ -673,7 +679,7 @@ bool PackageManagerCore::foundEssentialUpdate() const
 }
 
 /*!
-    Sets the value of \a foundEssentialUpdate, defaults \c true.
+    Sets the value of \a foundEssentialUpdate, defaults to \c true.
 */
 void PackageManagerCore::setFoundEssentialUpdate(bool foundEssentialUpdate)
 {
@@ -1111,8 +1117,7 @@ void PackageManagerCore::networkSettingsChanged()
 
     if (isMaintainer() ) {
         bool gainedAdminRights = false;
-        QTemporaryFile tempAdminFile(d->targetDir() + QStringLiteral("/XXXXXX"));
-        if (!tempAdminFile.open() || !tempAdminFile.isWritable()) {
+        if (!directoryWritable(d->targetDir())) {
             gainAdminRights();
             gainedAdminRights = true;
         }
@@ -1580,6 +1585,16 @@ Component *PackageManagerCore::componentByName(const QString &name, const QList<
     return nullptr;
 }
 
+bool PackageManagerCore::directoryWritable(const QString &path) const
+{
+    return d->directoryWritable(path);
+}
+
+bool PackageManagerCore::subdirectoriesWritable(const QString &path) const
+{
+    return d->subdirectoriesWritable(path);
+}
+
 /*!
     Returns a list of components that are marked for installation. The list can
     be empty.
@@ -2186,7 +2201,7 @@ QString PackageManagerCore::findLibrary(const QString &name, const QStringList &
 #if defined(Q_OS_WIN)
     return findPath(QString::fromLatin1("%1.lib").arg(name), findPaths);
 #else
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
     if (findPaths.isEmpty()) {
         findPaths.push_back(QLatin1String("/lib"));
         findPaths.push_back(QLatin1String("/usr/lib"));