summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | add target to create untranslated.tsOswald Buddenhagen2017-05-152-2/+5
| | | | | | | | | | | | | | 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>
* | Prepare 3.0.0 releaseKatja Marttila2017-05-154-8/+8
| | | | | | | | | | Change-Id: I6e7c58bd9ad958a65729b6b8cd55f2958fe92aed Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Update ChangelogKatja Marttila2017-05-151-1/+81
| | | | | | | | | | Change-Id: I5bd246a68e107d7ad29009bdc95f3f43139d355e Reviewed-by: Iikka Eklund <iikka.eklund@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>
* | Fix metadata resetKatja Marttila2017-04-251-1/+2
| | | | | | | | | | | | | | | | MetadataJob items should be reseted each time metadatajob starts only when it is not concerning compressed repositories. Change-Id: Ifa7e9d39bb9644ec36e057929f6874821c119ce3 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Fix invalid QBSP installer breakKatja Marttila2017-04-245-47/+98
| | | | | | | | | | | | Change-Id: I7e0bfc2fb0dc4c5438ec2c5ce59b49eb0f0348ee Task-number: QTIFW-954 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Proofread German translationFrederik Schwarzer2017-04-241-99/+99
| | | | | | | | | | Change-Id: I9bda8b78137f9793a4c38b1a8b3b96653fa86c7e Reviewed-by: Niels Weber <niels.weber@qt.io>
* | Change QBSP button nameKatja Marttila2017-04-071-1/+1
| | | | | | | | | | | | | | | | In macOS, QBSP button was taking too much space making component tree quite narrow. Shorten the button name to make more space to tree Change-Id: I92355c2a7ebe2442bdb6779454f2e6b2c01bb6e7 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Merge remote-tracking branch 'origin/2.0' into 3.0Katja Marttila2017-03-3014-5/+27
|\| | | | | | | | | | | | | Conflicts: src/libs/installer/downloadfiletask.cpp Change-Id: Ie4b07c402a63c7a12ecf24e52e197507bbb2c5df
| * Fix installer crash when it contains replaced and replacement componentKarsten Heimrich2017-03-241-11/+12
| | | | | | | | | | | | | | | | | | | | | | Do not execute the component script of a to be replaced component. This make no sense at all, cause in case of installer it is hidden and we can't install it anyway. Task-number: QTIFW-915 Change-Id: Ia0378047b162dafb854dff24e77a113b27885f9d (cherry picked from commit b1ed687f91d9b75e290ebabcb624684f7d177cb1) Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * QRegExp include cleanupSamuel Gaist2017-03-1312-2/+16
| | | | | | | | | | | | | | This patch adds the missing include statements for QRegExp. Change-Id: I05fed3e83514af895b95a3df746b0ae1e6b31828 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Do not fail to install or update if repository is missing2.0.5Katja Marttila2017-02-212-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If repository address becomes invalid or is deleted from the server, update or install fails if installer points to a removed repository. However, Updates.xml might have RepositoryUpdate with action 'remove'. If we prevent updating when one of the repositories is not found we never get to perform the 'remove' action to repository which makes the whole 'remove' action unusable. This commit changes the behavior so that warning is printed when repository is not found but it does not prevent the install or update if there are other valid repositories. Change-Id: Ic75b2e09542e304e09af87c7039798120f58d844 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Fix crash at the very end of install if admin rights needed in WindowsKatja Marttila2017-03-301-1/+2
| | | | | | | | | | | | | | | | | | Removed the destroy call to RemoteClientPrivate object as that has been destroyed at that point already in packagemanagercore destructor Task-number: QTIFW-943 Change-Id: Ibb7b4f00842d780b32055dbdc3673d031c52a89a Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Bump major version number to 3Konstantin Podsvirov2017-03-304-8/+8
| | | | | | | | | | Change-Id: If4cf94a34fd6ac22bed94fe8bb508c429ef82fe3 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Make installer to check the dependency versionKatja Marttila2017-03-235-29/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Installer was able to install dependency correctly. However, it ignored the version dependency might have. Dependencies>componentA->=4.0</Dependencies> If there was already a dependency installed with lower version number, the newer version, which was required by the selected component, was not installed. Fixed so that maintenancetool will not only check if the dependency is installed but also the installed version. Change-Id: Ia26b5233cf8847bce73095d19a13c481318d27f2 Task-number: QTIFW-914 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Merge remote-tracking branch 'origin/2.0'Katja Marttila2017-01-30370-6946/+5341
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-26376-7057/+5412
| | | | | | | | | | Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1 Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
| * Prepare 2.0.5 releaseIikka Eklund2017-01-175-8/+13
| | | | | | | | | | | | | | Changelog update. Change-Id: I3afdc34ea66926827656a4eac8f7582fbd562056 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Rename QtBSP as QBSPKatja Marttila2017-01-242-3/+3
| | | | | | | | | | Change-Id: I2537aec5d3065da78bf9b0c6970ff3b38c7d4946 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Fix uninstallation on Windows when target path contains non-ascii charactersSlobodan Vrkacevic2017-01-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows when a target path contains non-ascii characters and MaintenanceTool has a custom name like Uninstaller it was not possible to start uninstallation after otherwise successful installation. That was because the renaming of Uninstaller.exe.new and Uninstaller.dat.new was silently failing somewhere at the end of installation and there were actaully no files Uninstaller.exe and Uninstaller.dat. To fix this encode the vbs file which is passed to cscript as UTF-16 so that it can handle non-ascii file paths correctly. Change-Id: Id0feb8f8503594f2a9eedddcaa35ae103ccf2938 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Fix installer crash when it contains replaced and replacement componentKarsten Heimrich2017-01-201-11/+12
| | | | | | | | | | | | | | | | | | | | Do not execute the component script of a to be replaced component. This make no sense at all, cause in case of installer it is hidden and we can't install it anyway. Task-number: QTIFW-915 Change-Id: Ia0378047b162dafb854dff24e77a113b27885f9d Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Fix warning that should not appear on stdoutKarsten Heimrich2017-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the warning is written to stdout, parsing the output of --checkupdates might fail with invalid XML output. The change log shows that the warning was introduced in 70cc8ce0e1bd2beb15007045b99b26f6c6956206 and shown only in verbose mode, while change 70cc8ce0e1bd2beb15007045b99b26f6c6956206 made it always 'visible'. The later change went in probably without testing the check updates case... Change-Id: I9183089be89e823b4b082a7343885e360d9ad7f4 Reviewed-by: Riho Pihlak <rpihlak@gmail.com> Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Avoid warning messages when passing '--platform minimal'Frerich Raabe2017-01-113-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unattended installations typically use no UI, and the documentation recommends passing '-platform minimal' (note: one dash!) to hide the UI. Alas, the command line parsing is not implemented in terms of QCoreApplication::arguments() which means that even the -platform argument which is meant to be processed by QApplication is interpreted by the command line parser -- which then complains about the unknown switch by printing Unknown option: p, l, a, t, f, o, r, m Let's avoid this by just registering a dummy '--platform' switch ourselves. It has no effect, but avoids the warning. This however means that two dashes need to be used, because that's how the command line parser works. For what it's worth, there is also a 'gui.setSilent()' setter, but it's not quite as comprehensive as using the 'minimal' platform plugin: using setSilent() will still create a QApplication and thus create e.g. a task bar entry on OS X (and I suspect it requires an X connection on Linux). The 'minimal' platform plugin apparently avoids this. Change-Id: I8cd4cfd496f8c435f0766e3162672eaefbef94cc Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Merge remote-tracking branch 'origin/2.0'Katja Marttila2017-01-034-16/+28
|\| | | | | | | | | | | | | Conflicts: doc/installerfw.qdoc Change-Id: I3d991775eae96c7de689e4b92393065564940a5f
| * Fix hang in Windows when admin rights neededKatja Marttila2016-12-221-0/+2
| | | | | | | | | | | | | | Change-Id: I07f22c9452deae7a044ac186c8d1953df00df43c Task-number: QTIFW-902 Reviewed-by: SIGMA Surface Science Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Use deterministic sorting order for componentsJake Petroules2016-11-281-2/+10
| | | | | | | | | | | | | | | | | | Some components have an equal sorting priority. Therefore, we use the display name to disambiguate to avoid a "random" sorting order. Task-number: QTIFW-833 Change-Id: Ie0fea8cf6f251a1a712aca5ed53ed3c6f7cd9877 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Documentation fixesKonstantin Podsvirov2016-11-091-13/+15
| | | | | | | | | | | | | | | | Corrects inaccuracies on the ifw-updates.html page. Change-Id: I874edf6b23b68b6db5eb6581340e814e3d878d42 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
| * Resolve relative URLs from Updates.xmlKonstantin Podsvirov2016-11-082-6/+51
| | | | | | | | | | | | | | | | | | | | This change allows you to use relative URLs to update repositories. Absolute addresses are resolved relative to the current Updates.xml file is parsed. Documentation added to ifw-updates.html page. Change-Id: I025bdc3044d1ca9d6abcce3ccdc043d5f03667fc Reviewed-by: Konstantin Podsvirov <konstantin@podsvirov.pro> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Update Russian translationSergey Belyashov2016-12-301-794/+590
| | | | | | | | | | | | Change-Id: Id342fcfa0c147c3a3e5ddae584e5f1efae944651 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Fix crash at end of installer on Linux 64bitFrerich Raabe2016-11-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The installer occasionally crashed at the very end of the installation, apparently this is often triggered on Linux 64bit. It appears that this is caused by two or more threads using qDebug() concurrently: some operation still uses OperationTrace::trace() to print status output and at the same time we try to call showFinishedPage(), which uses qDebug() to print a not-so-useful message. Getting qDebug() out of the operations seems to be tough, and defining QT_NO_DEBUG_OUTPUT at build time to disable *all* qDebug() output feels like overkill, so let's fix this crash by just not printing a message in showFinishedPage(). Task-number: QTIFW-905 Change-Id: I4702eb511577148ae6cc0d32f1580d842e58e0b2 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Introduces new --silentUpdate command line optionKatja Marttila2016-11-157-79/+115
| | | | | | | | | | | | | | | | | | With this feature one can update all installed components silently with maintenancetool by passing --silentUpdate parameter Change-Id: If31d37ce24e794775c2fe47b603259da133c9ee7 Task-number: QTIFW-906 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | allow installing compressed packagesKatja Marttila2016-11-0917-65/+438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces new feature to add 7z packages to be installed. Packages must be installer repositories (created with repogen), compressed to 7z file and named as qtbsp or 7z. Selecting compressed package is done either with button in component selection page or with --installCompressedRepository parameter given to installer or to maintenancetool. Button will not be created by default. If you want to show the button either build IFW with DEFINES+=INSTALLCOMPRESSED or enable the button in control script with allowCompressedRepositoryInstall() in ComponentSelectionPageCallback Task-number: QTIFW-886 Change-Id: Ia060092c348991d5195393b7dc154205f8bf92a5 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Automatically load all fonts in 'fonts/' resourcesFrerich Raabe2016-11-082-0/+16
| | | | | | | | | | | | | | ...such that they can be used in style sheets. Change-Id: I677be428972dbfe9385cf438b0ccf2f0f3fcd822 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Merge remote-tracking branch 'origin/2.0'Iikka Eklund2016-10-253-3/+13
|\| | | | | | | Change-Id: Ibd01bc156481df973e3c9371d77af338a5e82607
| * Prepare 2.0.4 releaseIikka Eklund2016-10-135-8/+17
| | | | | | | | | | | | | | Update version number and ChangeLog. Change-Id: I9b6e8f9576d74002577c8c913ae61c2b577ab0ff Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Set also display name for Repository action "remove"Iikka Eklund2016-10-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | We should use the display name parameter if given when using action: <Repository action="remove" url="http://foo.bar" displayname="foobar"/> I.e. when the repository gets removed it should print out the given displayname. Now it always prints the url. Change-Id: I227c02c45c21be3c7c93d57f4242e1fc5c189f3c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * adjusted wrong repogen parameter nameAxel Menzel2016-09-081-2/+2
| | | | | | | | | | | | | | '--update-new-packages' => '--update-new-components' Change-Id: Idab604bac8581102210c1a6ad6f2092e89c779fb Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | update sync profileKatja Marttila2016-09-151-4/+4
| | | | | | | | | | Change-Id: I7c28950112de47e944b25d1dcee47767de83b313 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Revert "Allow signing maintenancetool in Windows"Katja Marttila2016-09-154-42/+15
| | | | | | | | | | | | | | | | | | | | This reverts commit 76fd6e8f2953347ea0bf7a57b643968784bc9acc. The change caused that two installation files were needed - one executable and one dat file. Many users did not find it acceptable. We need to figure out something else. Change-Id: Ief12cd47f9897cee8a234d8611a5c18296d42b1c Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Make support for modifying installations configurableFrerich Raabe2016-09-147-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>