summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Decrease metadata dowload amountKatja Marttila2018-06-013-12/+40
| | | | | | | | | | If there are no Script, Translations, Licenses nor UserInterfaces -tags in Updates.xml, there is no metadata. In such case, do not download the empty metadata to decrease the time used in downloading metadata. Task-number: QTIFW-975 Change-Id: I1b81a07b5ad43677e190fb058ece8b06382d215b Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Print component warnings only in verbose modeKatja Marttila2018-05-291-4/+7
| | | | | | | | | | If there are lot of components, it takes a lot of time to check every component for their errors. Print those only when --verbose given in command line. Task-number: QTIFW-975 Change-Id: If9467416d5d8f3417cd30262f95e91308a79e7a6 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Fix ForcedInstallation components uninstall in deselectAllKatja Marttila2018-05-171-6/+2
| | | | | | | | | We don't need to check the installed() state here as we do it already when preselecting components in the tree Task-number: QTIFW-1142 Change-Id: I3540a02f39ea7b379db6597c75d7fee76cc4caab Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Fix crash in updater if component does not exist anymoreKatja Marttila2018-05-141-4/+3
| | | | | | Task-number: QTIFW-1140 Change-Id: I2038bb04526d6fbc3b35be67777a1096f80568cf Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Fix nested autodependency uninstallKatja Marttila2018-05-033-5/+11
| | | | | | | | Previous commit worked only when --show-virtual-components was uses. Task-number: QTIFW-1114 QTBUG-67106 Change-Id: I6d0649a37095b10ec9fd3a079e020f6a70345c94 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add missing link from the documentation for hybrid installersAndy Shaw2018-04-201-1/+1
| | | | | Change-Id: I05a3f5711cb963933470704bfec2ba8839384c0c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Fix nested autodependency uninstallKatja Marttila2018-04-182-5/+17
| | | | | | Task-number: QTIFW-1114 QTBUG-67106 Change-Id: I29cdddaa81657e5fd2b9cbf343e16cc107ce6c18 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add missing content for example dependenciesJuha Karjalainen2018-04-0613-0/+26
| | | | | | | | | | | | | | | | | | | | | | Added missing content for example --> making it possible to test it. Changes to be committed: new file: examples/dependencies/packages/componentA/data/installcontentA.txt new file: examples/dependencies/packages/componentB/data/installcontentB.txt new file: examples/dependencies/packages/componentC/data/installcontentC.txt new file: examples/dependencies/packages/componentD/data/installcontentD.txt new file: examples/dependencies/packages/componentE/data/installcontentE.txt new file: examples/dependencies/packages/componentF.subcomponent1.subsubcomponent1/data/installcontentF_1_1.txt new file: examples/dependencies/packages/componentF.subcomponent1.subsubcomponent2/data/installcontentF_1_2.txt new file: examples/dependencies/packages/componentF.subcomponent1/data/installcontentF_1.txt new file: examples/dependencies/packages/componentF.subcomponent2.subsubcomponent1/data/installcontentF_2_1.txt new file: examples/dependencies/packages/componentF.subcomponent2.subsubcomponent2/data/installcontentF_2_2.txt new file: examples/dependencies/packages/componentF.subcomponent2/data/installcontentF_2.txt new file: examples/dependencies/packages/componentF/data/installcontentF.txt new file: examples/dependencies/packages/componentG/data/installcontentG.txt Change-Id: I40fde219a5ab866f611e596dd5991b9b93c8856f Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix build error in MacOSKatja Marttila2018-04-051-1/+2
| | | | | | | MacOS does not understand ceil, use qCeil instead Change-Id: I075aab60ae7e00336bdd4faf864c3922482401ac Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Fix install fail if there is huge amount of downloadable packagesKatja Marttila2018-04-032-20/+51
| | | | | | | | | | | In some machines, installer does not manage to download meta files if there are huge amount of downloadable packages. It seems that QtConcurrent is not always able to handle so many download tasks. Divided the downloadable tasks into size of 1000 to keep the QtConcurrent running. Change-Id: I3ba110e2cc565251e540349a6b073245280a6fbe Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Prepare 3.0.4 release3.0.4Katja Marttila2018-03-194-7/+16
| | | | | Change-Id: I2a7453e0a2a540a223dbdd5282f63413db5eb30e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Fix infinite wait if downloadable package is missingKatja Marttila2018-03-161-1/+1
| | | | | | | | | | Instead of waiting for a package that is missing, show error message and abort installation Task-number: QTIFW-1064 Change-Id: I021e7ece9e4020a85380318185cdb6a424dc26fa Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Fix the maintenancetool that failing to elevate to adminTakayuki ORITO2018-03-141-3/+4
| | | | | | | | | | | It fails to output logs in ~PackageManagerCore() when using '--checkupdates'. It is installed in 'C:\Program Files (x86)'(needs admin rights). Disable the admin query. Because it does not need the query for checking the updates. Change-Id: I8cbd5823287a23d52c2f1a7f1fae95979314e441 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix devtool's segmentation fault when using operationTakayuki ORITO2018-03-131-6/+6
| | | | | | | change the name of the variable to parse the arguments of operation command. Change-Id: I251b17e6e48b0a5c12636199de57bbb761b3ac23 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Update Japanese translationTakayuki ORITO2018-03-051-283/+1197
| | | | | | | | Update message in ifw_ja.ts Change-Id: I8a8495f57651eaa2a13a7b36206939f79fc96201 Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Avoid including macro.qdocconf from Qt documentationKai Koehne2018-03-011-1/+5
| | | | | | | | | | From Qt 5.11 onwards, macro.qdocconf requires QT_VERSION environment variable to be defined. Just copy the two custom commands we use in IFW. Task-number: QTIFW-1103 Change-Id: Ib2d81e0f9e7b5518206efaf2a219ceb8109f6490 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* 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 release date3.0.3Katja Marttila2018-01-311-1/+1
| | | | | Change-Id: I89e68d3606d967332e7ccba8bf17a828bd0989e4 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Prepare 3.0.3 releaseKatja Marttila2018-01-304-7/+15
| | | | | Change-Id: I7f8be5eda5bf2ad1843b6b7243f254bbf3d55f84 Reviewed-by: Iikka Eklund <iikka.eklund@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-252-6/+10
| | | | | | | | | 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-242-4/+6
| | | | | 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>
* Fix custom pages documentationKatja Marttila2017-12-141-1/+1
| | | | | | Task-number: QTIFW-1061 Change-Id: Ib7e8317eb718ecb3e22b89bbef0414f48502992e Reviewed-by: Antti Kokko <antti.kokko@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>
* Fix readFile documentationKatja Marttila2017-12-041-1/+1
| | | | | | | | | readFile method returns string and not boolean. Fix it to documentation. Change-Id: I8454b423a01e93c747087de662e6795a72db26bd Reviewed-by: Karim Pinter <karim.pinter@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@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>
* Prepare 3.0.2 release3.0.2Katja Marttila2017-11-215-9/+19
| | | | | Change-Id: Ia09157cb1984de782ffd2817f07afbcd3998c3b1 Reviewed-by: Iikka Eklund <iikka.eklund@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>
* Add clarifying documentation about QDesktopServices::openUrlAndy Shaw2017-11-131-0/+5
| | | | | | Change-Id: I2edca269b6f90511f4d41570a1ad08b7cc9d2f6a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Niels Weber <niels.weber@qt.io>
* Fix testsKatja Marttila2017-11-082-4/+1
| | | | | | Task-number: QTIFW-1027 Change-Id: I9d153924d0f88a537ddcf87e61cac2c550d6817f 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>
* Disable cross compilingKatja Marttila2017-10-231-0/+2
| | | | | Change-Id: Ib0db7d9238f60e6a859bb8b5292d4166945c5495 Reviewed-by: Iikka Eklund <iikka.eklund@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-132-9/+9
| | | | | | | | | 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>
* Explicitly declare implicit dependency on QtQml in devtoolJake Petroules2017-09-131-3/+2
| | | | | | Change-Id: I4ef19a4733d5c469676f3b419c6f4adf1e6ff0de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> 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>
* binarycreator: Write a proper LSMinimumSystemVersion valueJake Petroules2017-08-301-0/+171
| | | | | | | | | | This allows macOS to display a proper error message to the user if their OS version is too old, as opposed to (probably) crashing and displaying an error dialog with a stack trace. Change-Id: I37570062d7358cc6304182182f095c9e51e16d06 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>