summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/settings.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.0'Katja Marttila2017-01-301-17/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Changelog dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri src/libs/installer/lib7z_create.h src/libs/kdtools/kdgenericfactory.cpp src/libs/kdtools/kdgenericfactory.h src/libs/kdtools/kdupdaterapplication.cpp src/libs/kdtools/kdupdaterapplication.h src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp src/libs/kdtools/kdupdaterupdatesourcesinfo.h src/libs/kdtools/localpackagehub.cpp src/libs/kdtools/localpackagehub.h src/libs/kdtools/updatefinder.cpp src/libs/kdtools/updatefinder.h tools/binarycreator/resources/mkdmg.sh Change-Id: Iab2513f549832d2e750e77131c673457ab265af4
| * License header update to GPL-EXCEPTKatja Marttila2017-01-261-17/+12
| | | | | | | | | | Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1 Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
* | Make support for modifying installations configurableFrerich Raabe2016-09-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces support for a new setting 'SupportsModify' in the config.xml file. This is only relevant for Windows installers. By default (i.e. when omitting) this setting, it defaults to 'true' which means that the product supports modifying (i.e. reconfiguring) an existing installations. As such, the 'Modify' button show in Windows' list of installed programs will be enabled. Setting this to 'false' will cause the button to be disabled. Change-Id: I4105f3f0bce67830aa2ee8ae0e6f6abb25c35b30 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Make usage of authorization fallback optionalSlobodan Vrkacevic2016-05-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asking users to use the authorization fallback in case of authorization errors might be a bit problematic in some cases. If the users are not familiar with the concept, running: "<installer_exe> --startserver PRODUCTION,{GUID},{GUID}" from command line might be confusing or difficult. Also it might not help at all. So let's make this optional. If the config variable DisableAuthorizationFallback is set to true the installer will not ask users to run the authorization fallback but instead it will abort the installation immediately. In RemoteClient this is implemented by adding a new function called setAuthorizationFallbackDisabled. The init function could be also extend for this but the config settings are not loaded at the time when the function is called. Change-Id: I4baf1dea34c5cc0016e98df47a9492ee1418c5ee Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Allow specifying the installer size in 'em' or 'ex' unitsSlobodan Vrkacevic2016-02-291-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WizardDefaultWidth and WizardDefaultHeight configuration settings always expected pixel values. This made the installer look somewhat awkward on high DPI displays, in which case the ratio between the font size and the installer window size was such that the fonts looked very big. Let's fix this by allowing to specify the width/height of the installer using units which are defined in terms of the font size, namely 'em' ("The width of the letter M") and 'ex' ("The width of the letter x"). 'px' is supported as well and means the same thing as not specifying any unit at all: the given size is defined in pixels. We choose to *not* use the font width for 'em' and 'ex' to be consistent with what the Qt CSS parser does (see src/gui/text/qcssparser.cpp), which adheres to what the W3C document at https://www.w3.org/WAI/GL/css2em.htm describes. Change-Id: Iaeb5a29c79d437ef4b956cb318158181f6289ec9 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/2.0'Iikka Eklund2016-01-201-4/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: installerfw.pri src/libs/kdtools/kdgenericfactory.cpp src/libs/kdtools/kdgenericfactory.h src/libs/kdtools/kdupdaterapplication.cpp src/libs/kdtools/kdupdaterapplication.h src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp src/libs/kdtools/kdupdaterupdatesourcesinfo.h sync.profile Change-Id: Ifdc8b065f89b7e241bd3788ed79768e21888161f
| * Update license headersIikka Eklund2015-12-291-4/+3
| | | | | | | | | | | | | | | | | | Update existing license headers. LGPL -> LGPLv21. Update copyright year as well. Change-Id: Ie1d71f8c68186b8f625f409ddf94691f178093c9 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Read UrlQueryString from settings.Jarek Kobus2015-10-141-1/+1
| | | | | | | | | | | | | | Task-number: QTIFW-744 Change-Id: Ie67bbb5f753a86041c60f2e32fe6b36213e4613e Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Allow to use the stylesheet to customize UIDenis Shienkov2015-09-281-1/+6
| | | | | | | | | | | | | | | | | | | | Now it is possible to set a stylesheet file to customize the wizard's UI. The stylesheet adds to the config.xml file using the new "StyleSheet" element. Change-Id: I66271f755a0f742e96cf433fe557423a2261e432 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Sanitize QDebug outputKai Koehne2015-07-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Prefer using the stream operator logic instead of using QString::fromLatin1. Add a noquote() where a QString should be printed without any quotes/escapes. This also fixes the tests with Qt 5.5, where QString's are further escaped. Change-Id: Ie3afd14b9355101d3c0b52f30f66ec759c76526c Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Unify translated error messagesKai Koehne2015-06-241-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | * Enclose file paths in "" * Localize file paths with QDir::toNativeSeparators. * Make sure sentences end with a '.' * Append error details always by ':', e.g. tr("Failed to copy file '%1': %2").(...) * Use 'directory' instead of 'folder' everywhere Change-Id: Ie045f429f72ad5045c96537465c5fb9d2e99d250 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Enable feature live preview of dependenciesjkobus2015-05-071-1/+9
|/ | | | | | | | | This feature is available after setting InstallActionColumnVisible property to true inside config.xml Change-Id: I5071d5c5c4562100a96530c581de01760ca0d2d5 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Update CopyrightKai Koehne2015-02-181-7/+7
| | | | | Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix update from 1.6 and earlier to 2.0 installerbase.kh2015-02-061-4/+10
| | | | | | | | | | | | | | The update was broken caused by the attribute rename. We already print a warning and read the old value, though we did not set it for the new introduced tags in case of an update. Thus we where not able to read the .ini file and the values stored, but did fallback to the use the initial values from config.xml. Task-number: QTIFW-625 Change-Id: Iad1c96c690de81c5653864a3777c78bd43007249 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Revert "Allow spaces in path by default"Niels Weber2015-02-031-1/+1
| | | | | | | | | The change did the opposite of what it claims. This reverts commit b843bff42705044eb88bc87298873ed6f7a93c55. Change-Id: I79b1527a95ce64472b7cc20bc83649aef1b90127 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* no longer use Version as the repository format versionChristoph Vogtländer2015-01-201-1/+1
| | | | | | | | | | | | Use the Version value defined in config.xml as the product version exclusively instead of sometimes using it as the repository format version in components.xml (which must be 1.0.0) and sometimes as the product version. Change-Id: I63864947bf131ac6e246a2aaf6febdda0555c13d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* rename CreateOfflineRepository to CreateLocalRepositoryChristoph Vogtländer2015-01-081-6/+6
| | | | | Change-Id: I36d7a504b27dfff8b9d10c9d90b6ff77108b9982 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Add CreateOfflineRepository configuration optionChristoph Vogtländer2014-12-111-1/+10
| | | | | | | | | | Setting CreateOfflineRepository to "true" in config.xml will create a local offline repository, same functionality as "--create-offline-repository" command line option Change-Id: I51b947157ebc27800b1e9ad0b55d139ac6e164b2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add possibility to specify a control script.kh2014-12-101-1/+8
| | | | | | | | | | | | | Right now we support control scripts just as command line argument, but now we can also bundle it in the binary as well. This helps e.g. with running scripts during uninstallation, enables the possibility to modify the introduction page or enables headless installer builds. Task-number: QTIFW-495 Task-number: QTIFW-166 Change-Id: I6fee6a55db78ed28b1eeb8257a4febaa2703c04e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Introduce a setting for Wizard default height / widthNiels Weber2014-12-091-0/+11
| | | | | | | | | | | | | Setting WizardDefaultWidth / WizardDefaultHeight in config.xml allows to set a default width / height for the wizard window. Minimal size will still be set by the size of the contents. Depending on style, watermark and banner image may override this setting. Default behaviour is unchanged. Task-number: QTIFW-47 Change-Id: I5695d501b2b31ea87ea63e95de454657cfebede6 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Allow spaces in path by defaultKai Koehne2014-12-081-1/+1
| | | | | Change-Id: Iff1e5056a2465977fd6930f94a649ce51dd0fcd0 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Implement server authentication and updating repository credentials.kh2014-11-261-20/+41
| | | | | | | Task-number: QTIFW-570 Change-Id: I7b6b1fab8279331e5cb4b4da86726322b44a1109 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Allow spaces in RunProgramArgumentsNiels Weber2014-11-171-19/+52
| | | | | | | | | | | This changes the syntax of the RunProgramArguments entry in the config.xml. <Argument> sub tags need to be used to specify the RunProgramArguments now. Task-number: QTIFW-227 Change-Id: Ife007bf660cdcf4ff5e8e31bb9bb5ac2e5037616 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Remove long-time deprecated icon settingNiels Weber2014-11-141-14/+3
| | | | | Change-Id: Ic17dd39a0c9228537d272ad46d3e126dffc1c4dc Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Add LGPLv3 as new licenseKai Koehne2014-10-161-14/+7
| | | | | | | Change-Id: I61158f956894e209dccf83744b4753774676099d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* Set value for empty tags that should provide a default value.kh12014-09-051-5/+8
| | | | | | Task-number: QTIFW-541 Change-Id: Ib899d87be75baaa96b3b15d8a94f660c1a6544e0 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Rename settings in config.xml filejkobus2014-07-071-11/+11
| | | | | | | | | | | Rename UninstallerName to MaintenanceToolName (change its default value to "maintenancetool"). Rename UninstallerIniFile to MaintenanceToolIniFile. Change-Id: Ic8ceae80b43c6793ae9b0baacea2ea374a0f90d1 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Replace Q_OS_MAC with Q_OS_OSXNiels Weber2014-07-031-1/+1
| | | | | | | | Q_OS_MAC also refers to iOS. Change-Id: I91603d0add90a0f3948453a6b9628814b0d9f80c Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Enable QStringBuilderKai Koehne2014-06-191-2/+3
| | | | | | | QStringBuilder improves the speed of string concatenation a lot ... Change-Id: I9dedf7c3335ebf4a9194e837f9eb8135fae11356 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix tutorial examplejkobus2014-06-061-1/+1
| | | | | | | | | | | | - remove translations part - replace installation dir (root) with home in order to properly finish the installer wizard with default values - AllowSpaceInPath is now true by default (ChangeLog updated) Change-Id: I84e372ac4da05964d90851bf592fc87ee9409e3b Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Make sure we return an empty path if value is not set.kh12014-04-281-8/+13
| | | | | Change-Id: Ibc95455b7e8ff428c173c6eb0d181a9a655fd023 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/1.5'Tim Jenssen2014-01-171-0/+5
|\ | | | | | | Change-Id: I64c405bdefa700e614b9a9d8f24f490856322d04
| * Introduce function to set repository settings page visibility.kh12013-11-281-0/+5
| | | | | | | | | | Change-Id: Id61a2817561013c6fa85ddbca459b385d24de3e7 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Allow setting the color of page titles and subtitlesDavid Kaye2014-01-091-1/+6
| | | | | | | | | | Change-Id: I826e35536b4c337e0008fed82cfea4c3cf5cb080 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Allow users to select installer styleDavid Kaye2013-10-081-1/+6
|/ | | | | | | | Add a "WizardStyle" tag to config.xml that takes values "Modern", "Classic", "Aero" or "Mac" to force the style. Change-Id: Ibd6c329a6b159c202fa7a7aa535b36e00c544079 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Implement dedicated translation settings support.kh12013-06-261-2/+38
| | | | | | | Change-Id: I41dd23f01e9b511c217fee7f736d9187b8a8623a Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/1.3' into mergeTim Jenssen2013-05-171-0/+2
|\ | | | | | | Change-Id: I2ef155784d34a250c0adc878208b86da0ab2e5d2
| * Add a DisplayName setting for repositories.Niels Weber2013-04-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | If DisplayName is set, it will be shown instead of the URL. This serves to hide a repositories URL while still being able to pinpoint bugreports to a specific repository. Task-number: QTIFW-244 Change-Id: Iaf0bc1612b42f1044da936d0fc2c4ad0e1e85d61 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-111-1/+1
|\| | | | | | | Change-Id: Iabd77388834a27ace28587ded37c66b4c9a9cbd3
| * show the error string not the empty errorStringTim Jenssen2013-04-111-1/+1
| | | | | | | | | | | | | | | | Change autotest accordingly. Change-Id: Ia818cd822954f7022f965f0b504414db9fd56830 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-091-2/+2
|\| | | | | | | Change-Id: I3936ddf1e70aabc3402769d38c8a79cd50fe9077
| * raise an error if the root element is wrongTim Jenssen2013-04-041-2/+2
| | | | | | | | | | Change-Id: I5f77ac85d6327697934cdc78d5354c6814adb6c8 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-041-28/+50
|\| | | | | | | | | | | | | | | | | Conflicts: installerfw.pri src/libs/installer/settings.cpp tests/auto/installer/settings/tst_settings.cpp Change-Id: Idb89f22fe940a730ed03a7d10f11e1b5fa655b49
| * Add strict and relaxed parsing to Settings class.kh12013-03-261-38/+61
| | | | | | | | | | | | | | | | | | | | | | * StrictParseMode -> creating binaries and repositories * RelaxedParseMode -> running the installer/updater itself Introduced parse modes to be able to use old settings (existing ones on user systems) with new binaries. Add and adjust autotest. Change-Id: I3f7c7357325661a1197400d8d8dc2a5ca8bed184 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Add banner pixmap to the wizard.Niels Weber2013-03-251-1/+7
| | | | | | | | | | Change-Id: Ic786efe56f0d74740cf23fc5f9b691f88df59d35 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Remove blacklist as it is no longer necessary.Niels Weber2013-03-211-8/+5
| | | | | | | | | | Change-Id: Ia6c003694b7297c30b019db3882375127ff04c03 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Remove previously deprecated Pages config.xml element.Niels Weber2013-03-211-63/+2
| | | | | | | | | | Change-Id: I909c81896186ef5191d1dac799296da26e37072f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Deprecate Icon, introduce replacements.Niels Weber2013-03-211-5/+30
| | | | | | | | | | | | | | | | | | | | InstallerApplicationIcon is used on Mac and Windows for a custom icon of the installer. InstallerWindowIcon is used to set the window icon of the installer on all platforms. Change-Id: I1f555441875b96e4d8e4ca9a808cf18b3a566c3c Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-181-7/+1
|\| | | | | | | Change-Id: I36a907cf2ee075eace35dcc42317f4202c1f5569
| * Remove LogoSmall as it never did anything anyway.Niels Weber2013-03-181-7/+1
| | | | | | | | | | Change-Id: Ib3f2e2cdc44c06fe8f3c98ce3ddc7c72811eb8da Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 13:54:02 +0000