feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix hang at end of installation.

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

Change-Id: Ib2759cda2e24915880e134a13af126572094bd66
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Niels Weber
2013-12-03 09:23:14 +01:00
parent 796fcaf1d2
commit 9e2caea36f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs vendored
View File

@@ -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()
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@");