Commit 9e2caea3 authored by Niels Weber's avatar Niels Weber
Browse files

Fix hang at end of installation.



Task-number: QTIFW-416
Task-number: QTCREATORBUG-10974

Change-Id: Ib2759cda2e24915880e134a13af126572094bd66
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 796fcaf1
...@@ -191,8 +191,9 @@ function isRoot() ...@@ -191,8 +191,9 @@ function isRoot()
Component.prototype.installationFinishedPageIsShown = function() Component.prototype.installationFinishedPageIsShown = function()
{ {
isroot = isRoot();
try { try {
if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isRoot()) { if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isroot) {
installer.addWizardPageItem( component, "LaunchQtCreatorCheckBoxForm", QInstaller.InstallationFinished ); installer.addWizardPageItem( component, "LaunchQtCreatorCheckBoxForm", QInstaller.InstallationFinished );
} }
} catch(e) { } catch(e) {
...@@ -203,7 +204,7 @@ Component.prototype.installationFinishedPageIsShown = function() ...@@ -203,7 +204,7 @@ Component.prototype.installationFinishedPageIsShown = function()
Component.prototype.installationFinished = function() Component.prototype.installationFinished = function()
{ {
try { try {
if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isRoot()) { if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isroot) {
var isLaunchQtCreatorCheckBoxChecked = component.userInterface("LaunchQtCreatorCheckBoxForm").launchQtCreatorCheckBox.checked; var isLaunchQtCreatorCheckBoxChecked = component.userInterface("LaunchQtCreatorCheckBoxForm").launchQtCreatorCheckBox.checked;
if (isLaunchQtCreatorCheckBoxChecked) if (isLaunchQtCreatorCheckBoxChecked)
installer.executeDetached(component.qtCreatorBinaryPath, new Array(), "@homeDir@"); installer.executeDetached(component.qtCreatorBinaryPath, new Array(), "@homeDir@");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment