1 files changed, 11 insertions, 6 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index db1b99d3f..934570ae1 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -305,7 +305,7 @@ PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent)
         setWindowTitle(tr("Maintain %1").arg(m_core->value(scTitle)));
     setWindowFlags(windowFlags() &~ Qt::WindowContextHelpButtonHint);
 
-#ifndef Q_OS_OSX
+#ifndef Q_OS_MACOS
     setWindowIcon(QIcon(m_core->settings().installerWindowIcon()));
 #else
     setPixmap(QWizard::BackgroundPixmap, m_core->settings().background());
@@ -408,7 +408,7 @@ PackageManagerGui::~PackageManagerGui()
     \list
         \li \c Classic - Classic UI style for Windows 7 and earlier.
         \li \c Modern - Modern UI style for Windows 8.
-        \li \c Mac - UI style for OS X.
+        \li \c Mac - UI style for macOS.
         \li \c Aero - Aero Peek for Windows 7.
     \endlist
 */
@@ -1543,7 +1543,7 @@ void IntroductionPage::setErrorMessage(const QString &error)
 {
     QPalette palette;
     const PackageManagerCore::Status s = packageManagerCore()->status();
-    if (s == PackageManagerCore::Failure || s == PackageManagerCore::Failure) {
+    if (s == PackageManagerCore::Failure) {
         palette.setColor(QPalette::WindowText, Qt::red);
     } else {
         palette.setColor(QPalette::WindowText, palette.color(QPalette::WindowText));
@@ -1911,6 +1911,11 @@ void ComponentSelectionPage::entering()
     setColoredSubTitle(tr(strings[index]));
 
     d->updateTreeView();
+
+    // check component model state so we can enable needed component selection buttons
+    if (core->isUpdater())
+        d->onModelStateChanged(d->m_currentModel->checkedState());
+
     setModified(isComplete());
     if (core->settings().repositoryCategories().count() > 0 && !core->isOfflineOnly()
         && !core->isUpdater()) {
@@ -2173,7 +2178,7 @@ bool TargetDirectoryPage::validatePage()
     const QFileInfo fi(targetDir);
     if (fi.isDir()) {
         QString fileName = packageManagerCore()->settings().maintenanceToolName();
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
         if (QInstaller::isInBundle(QCoreApplication::applicationDirPath()))
             fileName += QLatin1String(".app/Contents/MacOS/") + fileName;
 #elif defined(Q_OS_WIN)
@@ -2844,7 +2849,7 @@ void FinishedPage::entering()
     }
 
     if (packageManagerCore()->isMaintainer()) {
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
         gui()->setOption(QWizard::NoCancelButton, false);
 #endif
         if (QAbstractButton *cancel = gui()->button(QWizard::CancelButton)) {
@@ -2908,7 +2913,7 @@ void FinishedPage::entering()
 */
 void FinishedPage::leaving()
 {
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
     gui()->setOption(QWizard::NoCancelButton, true);
 #endif