diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-19 15:33:54 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-20 11:25:58 +0100 |
| commit | 9547c3ff712665eeccfd54ce44376ec6401373e8 (patch) | |
| tree | b3be6df03ed785d77b8abf4aec22a49a205d6726 /examples | |
| parent | 23c08c852bd7d82c601aa73b62e30c43bc24c708 (diff) | |
Mark "os" variable as deprecated
Mark installer.variable("os") as deprecated, and replace it with
systemInfo.productType in the examples.
Change-Id: Ic86af21369cd066fc003b268f001101b642f6d2d
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js | 6 | ||||
| -rw-r--r-- | examples/startmenu/packages/org.qtproject.ifw.example/meta/installscript.qs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js b/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js index b97e47ce9..37a79c983 100644 --- a/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js +++ b/examples/dynamicpage/packages/org.qtproject.ifw.example.dynamicpage/meta/installscript.js @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Installer Framework. @@ -36,7 +36,7 @@ var ComponentSelectionPage = null; var Dir = new function () { this.toNativeSparator = function (path) { - if (installer.value("os") == "win") + if (systemInfo.productType === "windows") return path.replace(/\//g, '\\'); return path; } @@ -50,7 +50,7 @@ function Component() { installer.setDefaultPageVisible(QInstaller.TargetDirectory, false); installer.setDefaultPageVisible(QInstaller.ComponentSelection, false); installer.setDefaultPageVisible(QInstaller.LicenseCheck, false); - if (installer.value("os") == "win") + if (systemInfo.productType === "windows") installer.setDefaultPageVisible(QInstaller.StartMenuSelection, false); installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false); } diff --git a/examples/startmenu/packages/org.qtproject.ifw.example/meta/installscript.qs b/examples/startmenu/packages/org.qtproject.ifw.example/meta/installscript.qs index 15af2df12..7fbdf258d 100644 --- a/examples/startmenu/packages/org.qtproject.ifw.example/meta/installscript.qs +++ b/examples/startmenu/packages/org.qtproject.ifw.example/meta/installscript.qs @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Installer Framework. @@ -42,7 +42,7 @@ Component.prototype.createOperations = function() // call default implementation to actually install README.txt! component.createOperations(); - if (installer.value("os") === "win") { + if (systemInfo.productType === "windows") { component.addOperation("CreateShortcut", "@TargetDir@/README.txt", "@StartMenuDir@/README.lnk", "workingDirectory=@TargetDir@", "iconPath=%SystemRoot%/system32/SHELL32.dll", "iconId=2"); |