summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add property to disable default repository savingKatja Marttila2018-09-104-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | By default, all default repositories defined in <RemoteRepositories> are saved to maintenancetool.ini -file. When you start maintenancetool, the repositories are read from maintenancetool.ini and those are used. There are cases when we don't want to use the default repositories when running maintenancetol. Change-Id: I4507e16636f2d709aa099eaa865264800591ce0d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Update danish (da) translation for Qt installer-frameworkscootergrisen2018-07-121-84/+100
| | | | | | | | | | Change-Id: Ibc4dae55f01b42b636b2e09149f0f4caf6ede8e3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/3.0' into masterKatja Marttila2018-06-065-23/+50
|\| | | | | | | Change-Id: Ia00c88061f15fc9c9517b536609ac3260c0df2ef
| * 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>
* | Allow install other components if sha mismatches in metadataKatja Marttila2018-06-046-7/+33
| | | | | | | | | | | | | | | | | | Expanding commit "Add attribute to mark parts of install tree unstable." This change will allow installing other components if some component has sha mismatch. Change-Id: I61202da95dc07ca3f1fe931cfe1fbbb053596f42 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Fix select state for unstable componentsKatja Marttila2018-06-012-4/+14
| | | | | | | | | | | | | | | | | | | | In updater mode, unstable components needs to be unselected so that those won't be updated. In packagemanager mode, installed unstable components needs to be in checked state so that those won't be uninstalled. Change-Id: Ib3d16ae8c0eec4e07731a0082c02fd710ffdb9d6 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Merge remote-tracking branch 'origin/3.0' into masterKatja Marttila2018-05-156-27/+76
|\| | | | | | | Change-Id: I09cacedb966eebc3f42a3402b0b3dc4f6dcd9be8
| * 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>
| * 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>
| * 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>
* | Make unstable component text color darkerKatja Marttila2018-04-091-1/+1
| | | | | | | | | | Change-Id: Id4734ea34b910e5abba6743a5e7d73e220e98aea Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Add attribute to mark parts of install tree unstableKatja Marttila2018-04-058-12/+101
| | | | | | | | | | | | | | | | | | | | | | | | This commit adds new AllowUnstableComponents configuration. Setting AllowUnstablecomponents to true in config.xml will * allow installing other components when there are errors in scripts * allow installing other components when there are missing dependencies * will mark the 'broken' components uninstallable in treeview Task-number: QTIFW-930 Change-Id: I8d28cf9c4b0401e0bb76795e87d581f39b64f128 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Add findFiles methodKatja Marttila2018-03-262-2/+32
| | | | | | | | | | | | | | Task-number: QTIFW-1094 Change-Id: Ibc37e9b568f7f54e37f6ed6a5b040940cab5aebd Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Merge remote-tracking branch 'origin/3.0' into masterKatja Marttila2018-03-207-322/+1245
|\| | | | | | | Change-Id: I601b783a9d2eed009737b2779803457949cbb014
| * 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>
| * 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>
| * 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>
* | Merge remote-tracking branch 'origin/3.0' into masterKatja Marttila2018-02-266-10/+37
|\| | | | | | | Change-Id: Ic74ee1485204e09e2baa384468b581ba0d9c79cd
| * 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>
* | Merge remote-tracking branch 'origin/3.0' into masterKatja Marttila2018-02-0826-95/+366
|\| | | | | | | Change-Id: I8d0c8b9faa9537b50e989ec264ed7bfe8d2e358b
| * 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>
* | Enable expanding items by defaultRiho Pihlak2018-01-038-4/+48
| | | | | | | | | | | | | | | | | | | | An item can be expanded by default in component tree by setting ExpandedByDefault to true in package.xml file. Change-Id: Ib324327cf6ef6e2dda3271e704f3ced523c6579c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Add support dash (-) symbol in component nameKonstantin Podsvirov2017-12-057-21/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add colon (:) symbol as alternative separator beetwen component name and version to use dash (-) symbol in component name. For names with dash (-) symbol use colon (:) symbol as separator in dependencies between name and version, even if you do not specify a version. Requirement example: package-with-dash:>=1.2.3, stable:1.x, demo:v1.0-rc1, backward-compatibility:. Also add test 'tst_ComponentIdentifier' for check new feature. Task-number: QTIFW-948 Change-Id: I6340c8001dec369ed8d33fcc4a92c7bce660aec1 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Allow comparing non-numeric versionsKonstantin Podsvirov2017-11-131-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | Changes: - Improve KDUpdater::compareVersion method; - Add tst_CompareVersion test. Task-number: QTIFW-948 Change-Id: If64f807cfb04e56d2bdd5fa250f456631df3f239 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Add Component::addAutoDependOn methodKonstantin Podsvirov2017-10-302-0/+17
| | | | | | | | | | | | | | | | | | | | Changes: - Add addAutoDependOn method to Component class; - Add method documentation; - Improve tst_Solver test. Change-Id: I5ed62368d62567f1056e20d89ba03c2639e0eaee Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Merge remote-tracking branch 'origin/3.0'Katja Marttila2017-09-253-16/+17
|\| | | | | | | Change-Id: Id2e682dc2698e08f91bee83e2a94de57403545a0