summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | add warnings if ssl is requested, but is not possibleTim Jenssen2013-06-131-0/+2
| | | | | | | | | | | | Change-Id: I0635df924ccb4b55194f8124b2c99ea3dd6d82ad Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Merge remote-tracking branch 'origin/1.3' into 1.4Tim Jenssen2013-06-135-4/+2735
|\| | | | | | | 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>
| * Adding the translation for zh_cn.Alessandro Portale2013-06-124-3/+2735
| | | | | | | | | | | | | | Change-Id: I2d8b8f9b4ce5a1818955ee6c9ccd53a16f594187 Reviewed-by: Niels Weber <niels.weber@digia.com> 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>
* | Update ru ts.Ivan Komissarov2013-06-101-213/+58
| | | | | | | | | | Change-Id: Iebcdb112cb3947965612aa080e45bed70c75b806 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | fix a crash while testing a unresponsive serverTim Jenssen2013-06-071-1/+6
| | | | | | | | | | Change-Id: I7fdc44a8ca822ea2145c9867a348f8462b894068 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | add missing errorMsg, if XML file is brokenTim Jenssen2013-06-071-1/+1
| | | | | | | | | | Change-Id: Ied65747172adae0ad3cfb49382533f869ceb81d5 Reviewed-by: Karsten Heimrich <karsten.heimrich@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>
* | Update translationsNiels Weber2013-06-063-1472/+1736
| | | | | | | | | | Change-Id: Ibb4929c98084308adc7877edaea5171a265c66f2 Reviewed-by: Karsten Heimrich <karsten.heimrich@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-304-21/+90
| | | | | | | | | | | | 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>
* | add resetCheckSumDataTim Jenssen2013-05-302-0/+8
| | | | | | | | | | | | | | | | | | - Getting the redirect information was handled as general data. This resulted in a wrong sha1sum. Now the calculated sha1sum is reseted after getting a HTTP redirect. Change-Id: I3aebe33fea7091e8dc3cfeddc1feee4a50e2a748 Reviewed-by: Karsten Heimrich <karsten.heimrich@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-2921-1475/+260
| | | | | | | | | | | | 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>
* | Fix mingw build.kh12013-05-281-0/+6
| | | | | | | | | | | | Change-Id: I9b2ea46a38e490ddc1bdc3879e9ca10e9442a5cc Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@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-283-182/+227
| | | | | | | | | | | | Change-Id: I3e66e0e4f60d7a9f91bd3c4e941e5b957725c2fc Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Remove superfluous forward declaration.kh12013-05-281-1/+0
| | | | | | | | | | | | Change-Id: I6681e886d2fd448ca04b42fc832e984e9efdc2c3 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Remove superfluous unit tests.kh12013-05-283-199/+0
| | | | | | | | | | | | Change-Id: I4a792c50b2dcf438d41fa1ffef9d01be8227bc40 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Remove unused files.kh12013-05-272-229/+0
| | | | | | | | | | Change-Id: I420f461caae6cd45257edb3fab44c211659608c9 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | introduce no_app_bundle.priTim Jenssen2013-05-271-0/+2
| | | | | | | | | | | | | | - it tries to copy the needed qt_menu.nib dir Change-Id: I04fe564f62e16847a417e47c9a0719c043c1f027 Reviewed-by: Karsten Heimrich <karsten.heimrich@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>
* | disable getFileTimeFromProperty on Unix systemsTim Jenssen2013-05-221-0/+4
| | | | | | | | | | | | | | - it is not working correctly at the moment and will be fixed later Change-Id: I0527410f09fbdff33e6851558482bf329ba80de6 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | avoid wrong replacings in the load script codeTim Jenssen2013-05-211-6/+6
| | | | | | | | | | Change-Id: Ia0d437fe1200ffa692e7b9a204622619934e92a5 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | fix unknown component value in scripts while updatingTim Jenssen2013-05-212-3/+9
| | | | | | | | | | | | | | | | | | | | | | - the order of initializing the updatercomponents list was different then the packagemanagercomponents list - now every updatercomponents are inside the list before the scripts are called Change-Id: I2cfa8edb48326071f6976aa9f772afc477088719 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | add entered/left signal to pagesTim Jenssen2013-05-212-2/+8
| | | | | | | | | | | | | | | | | | - Now it is possible to connect at a time were every ui thing is setuped. So changes from script side at the ui can be done then. Change-Id: I479378e1f3d3f02eda47b7ee28ced8077feab277 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Update files-to-patch filesIikka Eklund2013-05-212-0/+2
| | | | | | | | | | | | | | | | Updated embedded windows and embedded linux patch file lists. Change-Id: Ia7b2fb695bc588f1c2d9a4d670ddb09d1e75f872 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | forward packagemanager core to ProductKeyCheck classTim Jenssen2013-05-175-10/+28
| | | | | | | | | | | | | | | | | | - with this the outsourced product key check code can enable, disable or even add repositories Change-Id: I390251b7f3bfa29a6f39a9ac44aa55ec15f780a2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.3' into mergeTim Jenssen2013-05-177-10/+41
|\| | | | | | | Change-Id: I2ef155784d34a250c0adc878208b86da0ab2e5d2
| * Add a DisplayName setting for repositories.Niels Weber2013-04-237-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | If DisplayName is set, it will be shown instead of the URL. This serves to hide a repositories URL while still being able to pinpoint bugreports to a specific repository. Task-number: QTIFW-244 Change-Id: Iaf0bc1612b42f1044da936d0fc2c4ad0e1e85d61 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | introduce installerscriptengineTim Jenssen2013-05-1617-438/+555
| | | | | | | | | | | | | | | | | | | | | | - it uses one scriptengine for everything and adds the components or/and the install-controller in javascript closure contexts - added the gui object to the component script context - removed tabController from controlscript context Change-Id: I3bd6c5dcf470666c30add1b7d04a8fdd094f5f11 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | remove GuiStartPage which was never documentatedTim Jenssen2013-05-081-5/+0
| | | | | | | | | | | | | | - even the current checks does not allow it Change-Id: I985f84be7385c9ec397ee390b181930436527a61 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Reset to only use the basic LZMA SDK (Windows).kh12013-05-08322-67337/+348
| | | | | | | | | | | | Change-Id: I8088cc4775f6c5397991f00512354836d614ea4e Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Replace the external date and time implementation.Niels Weber2013-05-073-435/+72
| | | | | | | | | | | | | | | | For now, replace it with a stub, the missing functionality isn't that crucial and will be reimplemented later. Change-Id: I2413069ad7837c8ccadc1c40e89eaf078674ee9e Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Remove local filetime.Niels Weber2013-05-073-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | This leads to time being wrong by a couple of hours depending on usage of local time vs UTC. This has been deemed acceptable for now. Also skip the test failing because of that difference. Needs to be re-enabled when all time functionality has been rewritten. Change-Id: I23d78371df65878d16e0e428c9fca9387e29a908 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | add installerscriptengine autotestTim Jenssen2013-05-072-0/+6
| | | | | | | | | | Change-Id: I662c22ea8fc1276c78abedd037f51f4afb08271f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Remove DosTime support from 7zip lib.Niels Weber2013-05-073-29/+0
| | | | | | | | | | | | | | We don't support that anyway and it complicates the DateAndTime implementation a lot. Change-Id: Ibb4f3bdf00beeb74446865376cdb67bd8337d5fd Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Cleanup installer_framework_changes.txtNiels Weber2013-05-063-1030/+54
| | | | | | | | | | | | Change-Id: I96671be32c66befdaa61a90440e164c6eba6fc07 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>