summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* move ts targets to a separate project fileOswald Buddenhagen2018-02-284-35/+43
| | | | | | | | that makes it possible to update the templates even if the ifw itself cannot be built (e.g., due to using a -no-widgets qt build). Change-Id: Ie170e6524dbed40f6c8b837e35af6b45a1c2d2dd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Remove unnecessary warningKatja Marttila2018-02-261-10/+0
| | | | | | | | | | | | Removed unnecessary warning about component specifying both autodependency and dependency to same component. Both of them might be necessary if we need to ensure the install order. Adding the same component as dependency will ensure that the dependency component will be installed first and its scripts run first. Task-number: QTIFW-1022 Change-Id: Id400f1ecf00a4b863ee473218d61a549c6ceb9ca Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Fix Mkdir operation in uninstallKatja Marttila2018-02-211-0/+7
| | | | | | | | | | | If Mkdir generates directories to target dir, then uninstall will fail to remove those as targetDir is replaced with @RELOCATABLE_PATH@ when the operations are written to dat file. Fixed so that @RELOCATABLE_PATH@ is replaced with targetDir. Task-number: QTIFW-1099 Change-Id: I52a0330a2645e2d4a5371ce0d6f1fb296878752f Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Enable building IFW with Squish supportKatja Marttila2018-02-124-0/+30
| | | | | | | | | | | | Change enables building IFW with Squish support by passing SQUISH_PATH to qmake when building IFW. Also enables runtime change of Squish port with command line option --squish-port <port number>. If no port is set, default port 11233 is used to attach to Squish. Change-Id: I4821b360031df66968d3592886c2e45598e1b097 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
* Fix usesSystemConfiguration usageKatja Marttila2018-01-301-3/+5
| | | | | | | | As usesSystemConfiguration() is introduced in Qt 5.8, use it only when compiling with Qt 5.8 or higher. IFW still supports version 5.6.2. Change-Id: Ib39f38a452624a84627ad53c9941154bc0fd7929 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Remove http_proxy environment usageKatja Marttila2018-01-252-16/+0
| | | | | | | | From Qt 4.8 onwards Qt automatically uses http_proxy environment variable. Change-Id: Ib7b3df96beeed14da86c1b17aa2402a9809f3983 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Set correct proxy typeKatja Marttila2018-01-251-2/+7
| | | | | | | | | From Qt 5.8 onwards system proxy might be used by default. Checked if that is the case and updated settings accordingly. Task-number: QTBUG-65143 Change-Id: Ibe8f3173636c57f73addcc576afdd37a68ec1d03 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Add no-proxy optionKatja Marttila2018-01-253-3/+10
| | | | | | | | | From Qt 5.8 onwards system proxy is used by default. Add option --no-proxy to enable installer usage with no proxy. Task-number: QTIFW-1085 Change-Id: If5247969aa9577cb746468c59802104d19826596 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Add line number information when throwing an Error regarding the scriptAndy Shaw2018-01-241-2/+3
| | | | | Change-Id: I5bc3ca4779ed12d927c3a6a041a81d8e39d5bd1f Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* make .ts file naming follow the usual patternOswald Buddenhagen2018-01-0312-18/+18
| | | | | | | | this makes it easier to integrate ifw into the surrounding infrastructure. Change-Id: I7918830b7a6c29d8556911eec83a3b6530478d84 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix maintenance tool file name parsing in macJani Heikkinen2017-12-191-2/+2
| | | | | | | | | Earlier we used QFileInfo::baseName but that doesn't work properly if '.' are used in file names. So start using fileName instead. Task-number: QTBUG-61262 Change-Id: I474b9656ef6d83dfbcdbc6ba6e40f95e75853c80 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Provide special handling of REG_EXPAND_SZ when setting environment variablesAndy Shaw2017-12-121-0/+51
| | | | | | | | | | | Since some registry settings with regard to the environment variables can have the type set to REG_EXPAND_SZ then we need to ensure that this is respected. Otherwise it will be changed to REG_SZ due to a limitation with QSettings. Task-number: QTIFW-794 Change-Id: Icaede82b151496367e531050082d416e19e15b56 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Avoid another null pointer dereferenceVille Voutilainen2017-12-121-1/+1
| | | | | | Task-number: QTIFW-1064 Change-Id: I053071292ef8786f6d829b57e45091e881ce3d4d Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Do not retry a download immediately after an errorVille Voutilainen2017-12-121-2/+1
| | | | | Change-Id: I1751b5274b3f2f6c69482d98c8beb2c1ef77ae70 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix crash when httpReadyRead is signaled after shutdownVille Voutilainen2017-12-111-0/+2
| | | | | | Task-number: QTIFW-1064 Change-Id: Id300f5838fb5f7e72a5e77415ac1832faa2d7c84 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add documentation for the setValidatorForCustomPage() functionAndy Shaw2017-11-301-0/+6
| | | | | | Change-Id: Id2c52f8a7fa2abbd1ac9de49d597269cb9bed220 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add possibility to reopen admin queryKatja Marttila2017-11-141-25/+31
| | | | | | | | | | | | | | In windows if admin rights are asked, you have two minutes to answer to the query. After that installing is not possible as there is no way to go back to admin query. Adding a possibility to restart the admin right query when 'No' pressed or two minutes timeframe has passed in Windows. Requires DisableAuthorizationFallback set to true, otherwize user is asked to use fallback '--startserver'. Task-number: QTIFW-988 Change-Id: Ide33b588299c981cfe653e7f53e7316a768d87bb Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Implement package download resumeVille Voutilainen2017-11-033-23/+225
| | | | | | | | | This doesn't implement a resume for checksum files and resource files; there's no pressing need for those. Task-number: QTIFW-5 Change-Id: Id14a3d9b46f2e16a15f52ae536d060d505b2f4f0 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Use QDir::rmdir and not rmpath as that will remove more than it shouldAndy Shaw2017-10-271-1/+1
| | | | | Change-Id: Ie38cc0f19817025c31124256ba968ecded61aef3 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Enable HighDPI support only in WindowsKatja Marttila2017-10-261-1/+7
| | | | | | | | Enabling HighDPI looks crappy in Linux. In MacOS this flag is not supported so enable it only in Windows host. Change-Id: I15167e45371daab1176b0043802bdc8a6954d67d Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Do not reset core when pressing 'Restart'Katja Marttila2017-10-161-1/+1
| | | | | | | | | | Core does not need reset when selecting 'Restart'. If resetting, settings dialog will lose some of its values etc. temporary repositories set from command line. Task-number: QTIFW-1017 Change-Id: Ifd67e373eaeccd85b985012b36b4314f59f0138f Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Output correct invalid directory if it does not exist or is not a directoryAndy Shaw2017-10-021-1/+1
| | | | | Change-Id: I166f485b97403f5bdf1c37d4aa36da780b339b43 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Always build libinstaller as a static libraryJake Petroules2017-09-131-0/+2
| | | | | | | | | This fixes the build if IFW is built with a dynamically linked Qt, and does not otherwise affect use of static builds of Qt. Task-number: QTIFW-993 Change-Id: I1e6807e522adde339263c697fa4a1353250a2e3f Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Update italian translationMichele Caini2017-09-131-2/+2
| | | | | | | | Change-Id: Iadf3bd6ee397839f7121c2991069d262a271e849 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Massimo Callegari <massimocallegari@yahoo.it>
* Update Russian translation3.0.1Sergey Belyashov2017-08-231-14/+13
| | | | | | Change-Id: Iaa474ae2ed0c462b66ad3355e35e4c5a76d549fc Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Merge remote-tracking branch 'origin/2.0' into 3.0Katja Marttila2017-08-2113-1/+19
|\ | | | | | | | | | | | | | | Conflicts: src/libs/installer/downloadfiletask.cpp src/sdk/translations/ru.ts Change-Id: Ibce8b9592c98cec5af3521f4ae6f850c2b8f45ac
| * Fix translation contexts in classes not derived from qobject2.0Sergey Belyashov2017-08-2112-0/+18
| | | | | | | | | | | | Change-Id: I0afbc19a27179b0646564cbb195683279175e98c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Update Russian translationSergey Belyashov2017-08-141-72/+20
| | | | | | | | | | | | Change-Id: I64a386e2c5c9f222c14384be002931746b60d3a4 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Move comment to correct locationKatja Marttila2017-04-121-2/+1
| | | | | | | | | | Change-Id: Iaa3e4814b3f028552df90fa2ac004a645578a659 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Fix install fail if there are missing repositoriesKatja Marttila2017-06-201-4/+6
| | | | | | | | | | | | | | | | | | | | If any of the repositories was not found or had unparsable Updates.xml, install failed although there was other valid repositories. Fixed so that warning is printed when such repositories found but continue install if there are other valid repositories. Change-Id: I04fe8d91382a3ea97ce22cd64159a6a7d825128d Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Fix Component Name visibility in maintenancetoolKatja Marttila2017-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | Most likely the first QTreeView field which contains the Component Name is the most valuable. Make sure that the name has enough space in QTreeView to show the whole component name. This change prevents user to resize the Component Name field Change-Id: I5f7dc7158d2d6f9f6ed1b900eb8d312cd88c03ec Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Adminauthorization freeze fixed under unixRobert Obermeier2017-06-151-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix x11 authorization livelock problems causing the installer to freeze after password entry. There might be unrelated issues causeing further freezes. Further explanation: If sudo does not terminate then closing stderr has no effect in remoteserver.cpp and the loop in adminauthorization_x11.cpp reading from pipedData will never terminate, causing the installer to freeze. It is important to close all references to stderr and terminate all applications that do not close stderr themselves in the fork/exec chain from adminauthorization_x11.cpp up to the remoteserver. Remoteserver will close stderr in remoteserver.cpp. Forking is done in main cause we can arrange it so that no threads are running up to this point. If any thread were running we would need to fork/exec in the child to be sure to restore a semi-deterministic state. Task-number: QTIFW-934 Change-Id: I87374d3ff195b42da0248c83aff020d373306d93 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Fix 'Failure to fetch repositories' if repo missing in Qt5.9Katja Marttila2017-06-131-0/+4
| | | | | | | | | | Change-Id: I0bb66c412bd60a6ec1a9a3dd30059928b43f3c0a Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Enable high-DPI scalingKatja Marttila2017-06-081-0/+1
| | | | | | | | | | | | Task-number: QTBUG-61122 Change-Id: I412af85f4dd6f379aa09de10d09726e3d2c130e1 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Fix maintenance tool update with silentUpdateKatja Marttila2017-06-012-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | Maintenance tool is an essential update. Essential updates should be installed before non-essential updates. This change forces essential updates to be installed first. The behavior is same as when updating with visible UI. Task-number: QTIFW-976 Change-Id: I360145821c4e2d1f3384efca641208acb9338d5e Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Change 'Checkable' element behaviorKatja Marttila2017-05-221-1/+7
| | | | | | | | | | | | | | | | Althogh 'Checkable' value is set to package, that can contain packages to install. Enabling the install of components using 'Checkable' value. Change-Id: I05d65fe2da65644872d46bdef3accd5e3f16ad31 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Add danish (da) translation for Qt 5.9 installer-frameworkscootergrisen2017-05-161-0/+2450
| | | | | | | | | | Change-Id: I3a52d35beff8039c3c24a4d28703a9dddcd812aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | update instructions for adding and updating translationsOswald Buddenhagen2017-05-152-21/+12
| | | | | | | | | | | | | | this also obsoletes the file list in src.pro, so it is deleted. Change-Id: Ic3f7499e710e35bd785c8041c6c53e937c21092e Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | add target to create untranslated.tsOswald Buddenhagen2017-05-151-2/+3
| | | | | | | | | | | | | | this is the standard way to start a new translation. Change-Id: Ie0235e41e39484af0b832a9b7488501bc883aaea Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | auto-generate english "translation"Oswald Buddenhagen2017-05-152-2653/+6
| | | | | | | | | | | | | | | | this file is merely a placeholder. there is no point in it being in the repository. Change-Id: Id07be46a9fa0c2eb14cbc567cb95e67c00f18b02 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | revamp build of translationsOswald Buddenhagen2017-05-152-61/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | instead of using a hand-crafted qrc file, auto-generate one. this allows us to collect available translations dynamically, which means that we don't need to limit ourselves to the state of qt 5.5. as a side effect, this removes the possibility to compile the qt translations ourselves. i'm not sure what the point of that was, as every qt installation would have pre-compiled qm files. Change-Id: Ie88327e848c2498eb2a63a895a80e1cd603619b8 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | fix commit-ts targetOswald Buddenhagen2017-05-151-6/+6
| | | | | | | | | | | | | | | | | | the pattern *_?? (meant to exclude *_untranslated) doesn't match ifw's translations without a country code, because they have only a language code. use two patterns instead. Change-Id: I5c0f67c339053281dfbee1bcd16b03ac6ca1b6e2 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | fix capitalization of zh_CN.ts file nameOswald Buddenhagen2017-05-151-0/+0
| | | | | | | | | | Change-Id: I466ad08c4ebc1b086cd5b6d6d061ffef9fa3eced Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Ignore used separators when comparing file namesKatja Marttila2017-05-151-1/+3
| | | | | | | | | | | | | | | | The separations might differ in QDirIterator and excludeFiles. Make sure that same separators are used when comparing the values. Change-Id: Ib1c810150e600cd647f5b3a24565268b79f4b09f Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Check license when doing silentUpdateKatja Marttila2017-05-153-0/+9
| | | | | | | | | | | | Task-number: QTAUTO-428 Change-Id: Ib3d56b59a12d4c7091a6abdbc5231ed5dbe2c3b1 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Add progressbar to indicate unzip job is proceedingKatja Marttila2017-05-109-7/+32
| | | | | | | | | | | | | | | | | | | | | | When a big compressed package is unzipped, it seemed that the installer hanged as there was no indication that the job is still ongoing. Added undetermined state to progress bar as unzip job does not inform the progress state. Task-number: QTIFW-967 Change-Id: I21ca394e1856038c51413f9e5011307ae7a9850a Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Give warning and exit install if invalid URL given for 7z repositoryKatja Marttila2017-05-101-0/+6
| | | | | | | | | | | | Task-number: QTIFW-966 Change-Id: I13cf001771d30e0737348d33183e329e4c1d2070 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Fix install corrupt with silentInstallKatja Marttila2017-05-103-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | If there are updates available for a component that is executable and the executable is running, installer is unable to update the component and results to a corrupted install. Check that there are no processes running from the install tree and cancel update if there are any. The update is canceled if there are processes running even if the process does not get update. Task-number: QTIFW-969 Change-Id: I5614cdd21d8538ccf8b0d114d3616804fe367667 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Clarify the add/remove components string to make it clearerAndy Shaw2017-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | Since there is generally confusion as to what will be installed, removed or updated the string is clarified further to hopefully make it much more clearer what will happen depending on whether it is checked or not. Change-Id: I1077b3dd3e4511e01ca64d0598942d5254e33a54 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Fix unnecessary component calculate in silentUpdateKatja Marttila2017-05-021-11/+15
| | | | | | | | | | | | | | | | If there are no updates available, no need to calculate components to install Change-Id: I95068ef0e062f1745cbe10138407e658befb2c5b Reviewed-by: Antti Kokko <antti.kokko@qt.io>