1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp
index 11a846e612..35454e5d09 100644
--- a/src/plugins/qnx/qnxconfiguration.cpp
+++ b/src/plugins/qnx/qnxconfiguration.cpp
@@ -147,10 +147,11 @@ bool QnxConfiguration::activate()
         foreach (const QString &error, validationErrors())
             errorMessage += QLatin1String("\n") + error;
 
-        QMessageBox::warning(Core::ICore::mainWindow(),
+        QMessageBox::warning(Core::ICore::dialogParent(),
                              QCoreApplication::translate("Qnx::Internal::QnxConfiguration",
                                                          "Cannot Set Up QNX Configuration"),
-                             errorMessage, QMessageBox::Ok);
+                             errorMessage,
+                             QMessageBox::Ok);
         return false;
     }
 
@@ -178,7 +179,7 @@ void QnxConfiguration::deactivate()
     foreach (Kit *kit, KitManager::kits()) {
         if (kit->isAutoDetected()
                 && DeviceTypeKitAspect::deviceTypeId(kit) == Constants::QNX_QNX_OS_TYPE
-                && toolChainsToRemove.contains(ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID)))
+                && toolChainsToRemove.contains(ToolChainKitAspect::cxxToolChain(kit)))
             KitManager::deregisterKit(kit);
     }