summaryrefslogtreecommitdiffstats
path: root/src/libs/installer
Commit message (Collapse)AuthorAgeFilesLines
...
* | Documented two more predefined variables.Niels Weber2013-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | Also allow uppercase variable names and document those. Also update the config.xml files in the examples to uppercase. Task-number: QTIFW-257 Change-Id: I446ed4e537cb7c15f49ba3071a9ab6591aab3329 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Make it possible to filter repositories not matching the license.kh12013-08-083-1/+14
| | | | | | | | | | | | | | Change-Id: I8ca36004394778ecd680636b36bfeafe8fcd1ff8 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix stupid mistake to use a private class in public API.kh12013-08-077-31/+37
| | | | | | | | | | | | | | | | Also a preparation the be able to implement the next commit. Change-Id: Iaeba54e5c1cfe97178e28fcc3fe72f9623f10bc6 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix component selection shows wrong package sizes.kh12013-08-072-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTIFW-302 This patch extends patch d4642f3ff. Reduce the number of calls to calculate the uncompressed size to do it only once per model update. We need to update the current selected component to reflect possible sub-node changes. Change-Id: I4a8121148f1974872b3c43d2f58351aad9c59421 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | use dependency solver to order the installed operationsTim Jenssen2013-08-064-2/+207
| | | | | | | | | | | | | | | | | | | | | | | | - in case of single updates the order of the installed operations were wrong, now we reorder that till we are using that code for the install order aswell - added initial autotest for the dependency resolve code Task-number: QTIFW-318 Change-Id: If411a684cb02ef9e7d0316084075e86702bf839d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | If we reset the model, we need to delete old components as well.kh12013-08-061-0/+1
| | | | | | | | | | | | | | | | | | Task-number: QTIFW-313 Change-Id: I2a761cd68d868dd35d022956c0c6662fa07919a5 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Mac: Patch also paths to files that still existKai Koehne2013-08-051-2/+1
| | | | | | | | | | | | | | | | | | This regularly breaks Qt builds in the internal build systems: The build machines might have still an 'old' build of Qt at the original location. Change-Id: I14df89606f795bf064f5864e0426d7b6702e3b28 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fix update component selection shows wrong package sizes.kh12013-07-302-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTIFW-302 During the update of KdTools we removed a bit to much code, so the compressed/ uncompressed size was never passed to the component. Now we keep and set it properly again. Force an update of the uncompressed component size once we have calculated all checked components. Change-Id: I12a796b543bbacdef4fbbdac10ff1103612c4c61 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fix broken model/component update due to wrong connected signals.Tim Jenssen2013-07-293-23/+15
| | | | | | | | | | | | | | | | | | | | - After 3eb3be the updater and the default model got the same components set once setRootComponents was emitted. The results was that both models would show all fetched components, not differentiating between updates and normal components. Change-Id: I053fdea73d42ca5ac1c2c26ebb063d9e7e415a13 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | cleanup some more if statementsTim Jenssen2013-07-261-16/+12
| | | | | | | | | | Change-Id: I9f3ba79f069c79faefdd9eacdc8f40cd0411f11d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | add component name to operation debug outputTim Jenssen2013-07-262-3/+3
| | | | | | | | | | | | | | | | | | - set the component name to every operation which comes from a component Change-Id: I3e4a1ab2896f7b469fe6606c7e89127c3d6fbc43 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | rename operation to operationNameTim Jenssen2013-07-262-14/+14
| | | | | | | | | | | | Change-Id: I6e8f87b40f0bac3a6e50b923cf260f721abc9e07 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Fix race condition when connecting to fs processKai Koehne2013-07-241-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression introduced by 2a73db7e34b: We only tried to connect to the port 3 times immediately after the fs process was started, which might be too short. Instead, expicitly try to connect for 30 seconds, and only give up then. Task-number: QTIFW-316 Change-Id: I8a1ba59ff680f4ef536f13230215f2289ab3b0ed Reviewed-by: Niels Weber <niels.weber@digia.com>
* | cleanup installicon operationTim Jenssen2013-07-011-19/+28
| | | | | | | | | | | | | | | | | | | | - changed errors in warning at the undo step - removed unnecessary processEvents call (operations are not call in the mainthread since ages) - don't remove backups in destructor Change-Id: Ia2d01400a2eee81024d11b88ccdd9337c9ffbbfa Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Allow to add an icon to the link, update example to show all args.kh12013-06-261-15/+28
| | | | | | | | | | | | | | | | Task-number: QTIFW-299 Change-Id: I5ba2560cc57fdf3980466df98cd64420aeefac20 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Implement dedicated translation settings support.kh12013-06-263-5/+58
| | | | | | | | | | | | | | Change-Id: I41dd23f01e9b511c217fee7f736d9187b8a8623a Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | fix argument check in QtPatchOperationTim Jenssen2013-06-251-2/+3
| | | | | | | | | | Change-Id: I9220fec90df5b7dad2e49db90209e64bbc4fd8b2 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Make .desktop file executable.Niels Weber2013-06-241-1/+1
| | | | | | | | | | | | | | | | Improves compatibility. Task-number: QTIFW-301 Change-Id: I648071075fd802a5e9b8ff248b423849125b0d74 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Trim whitespaces from path names.kh12013-06-192-6/+4
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTIFW-276 At least on windows CreateDirectory will trim them anyway, so the shortcut operation will fail as the created directory does not match the arguments passed. Change-Id: I76466ef1d83461559c51021ad2bedaf36a145f51 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | mingw compile fixkh12013-06-191-0/+3
| | | | | | | | | | Change-Id: I2d67db72e76a25f5af7ae4e0d23efe6f08bfe68e Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Force admin rights (if needed) to be able to write the ini file.kh12013-06-191-0/+14
| | | | | | | | | | | | | | Task-number: QTIFW-291 Change-Id: I41089cd8a82b8b53e8ba3c4edd4441afae1d8055 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | executeoperation forward error output to qwarningTim Jenssen2013-06-181-1/+10
| | | | | | | | | | | | | | | | - with that we can see something in the verbose output Change-Id: Ic427cfb93d04c1a4f6e3bc8d8355c5d6f49a8c3d Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | add readAllStandardError method to our QProcessWrapperTim Jenssen2013-06-183-0/+11
| | | | | | | | | | | | Change-Id: I6bbce73c8346e76ae4b5ce451353bb28695a4f9a Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | fix designer warningTim Jenssen2013-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | - MessageBoxHandler::currentBestSuitParent() is a QWizard in most cases and then it tries to add QWidgets to it, but it allows only QWizardPage - this results in a memory leak of the translatewatch objects inside the loader, but needs to be fixed in the QUiLoader see QTBUG-31818 Change-Id: I67b0cc78c3843d4bbe70f015a63b5c26bb7f9e2c Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Set SEE_MASK_NOASYNC when launching elevated processKai Koehne2013-06-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | Set the SEE_MASK_NOASYNC flag in the hope to fix the mysterious "Couldn't get authorization" error. This requires the platform API from MSVC 2007 or newer. Task-number: QTBUG-31788 Change-Id: Ida254820e7c46e80bc2269531183c206c1fe2c8d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Check return value of ShellExecuteExW instead of GetLastErrorKai Koehne2013-06-171-2/+1
| | | | | | | | | | | | | | | | | | | | It's unclear from the MSDN documentation whether LastError is also set if ShellExecuteEx succeeds. Therefore rather check for the return value. Task-number: QTBUG-31788 Change-Id: Id74377445c5e64a056d4f1c0ec6ae29b02a0d98e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Fixed argument check of EnvironmentVariableOperation.Niels Weber2013-06-171-2/+2
| | | | | | | | | | | | | | | | Task-number: QTIFW-286 Change-Id: I4c8cb25f70a05c7a5a3754e46680767d4b345523 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | add warning output if AdminAuthorization::execute fails on winTim Jenssen2013-06-141-2/+33
| | | | | | | | | | Change-Id: I4ce3cc601f4d49bc7e4367cbe021304cd6338057 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/1.3' into 1.4Tim Jenssen2013-06-131-1/+0
|\| | | | | | | Change-Id: Ic8e6c13d020dbff3e1fb1ef156742aef81ba1b25
| * Do not delete backup file that we just created.Niels Weber2013-06-121-1/+0
| | | | | | | | | | | | | | | | Task-number: QTIFW-271 Change-Id: Ie6a2b76c2c141c2cf4773b01034eefaf21ce9e90 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | fix crash if core is not thereTim Jenssen2013-06-121-2/+2
| | | | | | | | | | Change-Id: I2eaf6015c6bbc601338f94db0761ddd0016a8211 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Show displayname instead of url in error message.Niels Weber2013-06-061-1/+1
| | | | | | | | | | Change-Id: Ide04619a524a68348819715958bfcb8ae5f909a2 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Make sure we close the file once we read the content.kh12013-06-051-1/+4
| | | | | | | | | | | | | | | | | | | | Fixes exception thrown on windows in case we can't read the content or got an repository update. This can happen since the finish signal is emitted synchronously and the following code is trying to delete the still opened updates xml file. Change-Id: I32b252e372ed11c05b04e0d2736400527bdb9a59 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | add exceptionhandler code for connected signals/JS methodsTim Jenssen2013-06-032-3/+12
| | | | | | | | | | | | | | | | | | | | | | - there wasn't any error information if a C++ triggered signal resulted in a JS method which has an error, now it will create an exception for it - creating messagebox inside the lib is something what we want to avoid, so the developer itself is responsible to catch these exceptions - most cases of the installer code does that already Change-Id: I07486f73be9de13a486de235f14e3a7d7b54f5b1 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | adding ConsumeOutputOperationTim Jenssen2013-06-0310-62/+328
| | | | | | | | | | | | | | | | | | | | | | - With that operation we can save the original qmake output, before the installer does the patching. So we can use the old values for modules patching if they will be installed later. - added a autotest which does that with the current used qmake Change-Id: Ie07d273bf64d1813b7af3374a0db35a9e1215503 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | rename method in productkeycheckTim Jenssen2013-05-313-3/+3
| | | | | | | | | | | | | | | | - isValidLicense(fileName) -> isValidLicenseTextFile(fileName) - so we don't confuse user with hasValidKey Change-Id: Ife2a88f244a75238dec5d70c280e6b4331a34a8a Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Fix QT_HOST_LIBS qmake patchingSergio Ahumada2013-05-311-1/+1
| | | | | | | | | | | | | | | | | | This amends commit 5e1f41cd070130d34090be506cc3e239d3159e8b Task-number: QTIFW-262 Change-Id: Iaa941bd6d30c5e5387505ca7674dda256afc66da Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Implementation of time and date functions related to 7z.Niels Weber2013-05-301-10/+2
| | | | | | | | | | | | Change-Id: Icb706d829f8470d8cc3cc50925c99255cf5f2b26 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Properly calculate the file size for symlinks.kh12013-05-302-0/+37
| | | | | | | | | | | | | | | | Task-number: QTIFW-137 Change-Id: I8a39094228bbb82ff99adfa814cda79634f71274 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Omit debug output in case there is no value given.kh12013-05-301-1/+2
| | | | | | | | | | Change-Id: Icad15ff57876947f6c07ce940f2395bfdb547a37 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Change two fatals to warnings.Niels Weber2013-05-301-2/+2
| | | | | | | | | | | | | | We don't want the installer to crash on the user. Change-Id: Iec932583615573ed41e15def6506a9e475b4dabd Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | revert any changes at hasAdminRights()Tim Jenssen2013-05-291-4/+4
| | | | | | | | | | | | | | Task-number: QTIFW-266 Change-Id: Ie8d7cae686cbe6e00ddfbd715c72f937a7f1929d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | add errorString to execute operation error outputTim Jenssen2013-05-294-1/+13
| | | | | | | | | | Change-Id: Ieb1db289f50188107204e0a1e42ccb51f512229e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | code cleanup -> removed some spacesTim Jenssen2013-05-291-7/+7
| | | | | | | | | | Change-Id: I012222d065873d08d1c6c7c2dfc905ddc34b8dd0 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Cleanup KDTools from stuff we do not use at all.kh12013-05-292-5/+3
| | | | | | | | | | | | Change-Id: I62d5ec103aafe7f2f4a497cc339271bdb33a8f92 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | use right types to interact with WinAPITim Jenssen2013-05-281-5/+5
| | | | | | | | | | | | | | | | - the problem is that a bool variable is not big enough to get the result of CheckTokenMembership this causes in random memory corruptions Change-Id: I16d07ae9af1e5991990ed010a8c4fdb463e5e833 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Implement configuration interface.kh12013-05-282-1/+23
| | | | | | | | | | | | | | Task-number: QTIFW-196 Change-Id: I87724252ae4860c2fadc12786c6e588d9c45332f Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Split our own implementation of sysinfo.kh12013-05-282-1/+225
| | | | | | | | | | | | Change-Id: I3e66e0e4f60d7a9f91bd3c4e941e5b957725c2fc Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Patch QT_HOST_LIBS qmake variableSergio Ahumada2013-05-271-0/+4
| | | | | | | | | | | | | | | | - add QT_HOST_LIBS (qt_hlibpath) to be patched Task-number: QTBUG-31339 Change-Id: I5b98bb4a44cf263e1f7db199610f31372b8899c3 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | disable batch compile rulesTim Jenssen2013-05-241-0/+4
| | | | | | | | | | | | | | | | - this is needed if the pri file includes cpp files with already existing cpp file names Change-Id: I00798a08ad7af990ae9aabd5c1f91edc9ee4307f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>