summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 syntax errorsJake Petroules2017-07-241-3/+3
| | | | | | | | | | | | | | | | Somehow a newline snuck into the wrong place, and ???? is recognized as a trigraph, which produces a warning. Change-Id: If948c544cba7ca880db4077bc3192332ce87ea52 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | Write plists in the correct format, using v1.0 and with tabsJake Petroules2017-07-191-19/+19
| | | | | | | | | | Change-Id: I496446d95b5523087e3d15ab3ad7cba697dea361 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Prepare 3.0.1 releaseKatja Marttila2017-06-265-9/+17
| | | | | | | | | | Change-Id: I799de5aa50040aea159d9f13209e73d19ffed9d7 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Fix install type if --online-only passed to binarycreatorKatja Marttila2017-06-221-2/+5
| | | | | | | | | | | | | | | | | | Binarycreator assumed that install type is offline if no repositories was set although --online-only was set. However, repositories might be set later, for example in producetkeycheck::init(). Change-Id: Idd6d0e3304974773baefe3773be7e2948704575c 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 required Qt version to 5.6.2Katja Marttila2017-05-232-2/+3
| | | | | | | | | | Change-Id: Ib26089c0c7101547ff671e510a8b3484f175e1c4 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Fix ld warnings in macOSKatja Marttila2017-05-231-0/+1
| | | | | | | | | | Change-Id: I6f5b98bdd2a5997f6549219393570d6db09bbad0 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Change 'Checkable' element behaviorKatja Marttila2017-05-225-22/+27
| | | | | | | | | | | | | | | | 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-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>