summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* improve RepositoryUpdate docTim Jenssen2013-09-111-14/+15
| | | | | | | | - make clear that there is only one RepositoryUpdate section Change-Id: Ia2c2ea8d97f706c6318747745a327e4c07c9bbeb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Rewrite function to use QFile::map().kh12013-09-102-28/+22
| | | | | | | | | Once the data is mapped into memory, searching backwards is way faster. Change-Id: I31667095712cfba95a8255e04d217ed9242fd2a8 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add binary format autotest.kh12013-09-103-1/+122
| | | | | | Change-Id: I0e718df1a53ca2f3641e59c7dbca80175814ee02 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Merge remote-tracking branch 'origin/1.3' into 1.4Tim Jenssen2013-09-091-1/+1
|\ | | | | | | Change-Id: I9fd96d5906048e6d258490f82d93c7f2ef942b09
| * Fix installer.dat not found issueMichal Klocek2013-08-281-1/+1
| | | | | | | | | | | | | | * use applicationDirPath() instead of applicationFilePath() Change-Id: I2f25dd88d3c024b20d0ef1937e7a8e50a8183594 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | fix progress for redirected HTTP Downloadskh12013-09-091-0/+6
| | | | | | | | | | | | | | | | | | | | - do not emit the progress in the redirect case for the redirect data Task-number: QTIFW-267 Change-Id: Id32018a92df3098e45c963b4dcf7924bebdd1354 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Add support to update only new components.kh12013-09-061-6/+63
| | | | | | | | | | | | | | | | Task-number: QTIFW-234 Change-Id: I49f1714925e7c83e06c86c9022cc8ae8ff01a840 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Doc: Clarify AutoDependsOnKai Koehne2013-08-291-1/+1
| | | | | | | | | | | | Change-Id: I49a9db7642a0723dd31aa712fbdef78242fdda1d Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Bump versionKai Koehne2013-08-294-5/+5
| | | | | | | | | | | | Change-Id: Ie18e88bb65a8765afdd3e1e8767ad0cb9b584d77 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Cleanup and improve output of --helpNiels Weber2013-08-291-44/+48
| | | | | | | | | | Change-Id: I1bfe519e858cfcb698522c8e8890c16c52669d81 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Add a line to --help about multiple repositories.1.4.0Niels Weber2013-08-271-0/+6
| | | | | | | | | | | | | | | | | | | | Also document --updater and --manage-packages options. Task-number: QTIFW-348 Task-number: QTIFW-350 Change-Id: Icdb2fe04adbdebc11cf929b5f2f6880835c989ec Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Update files-to-patch-* for 5.2Iikka Eklund2013-08-264-0/+16
| | | | | | | | | | | | | | | | | | | | "host-bin/" added for b2qt and files-to-patch-macx-emb-arm added for iOS. Change-Id: I982648dbd9983eb8617a066c65c171742d59f2b0 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Remove deprecated argument.kh12013-08-261-2/+2
| | | | | | | | | | | | Change-Id: Ied0b8ef0e35fb39b6b5786f54c9844847d638cec Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.3' into 1.4Tim Jenssen2013-08-261-0/+8
|\ \ | |/ | | | | Change-Id: Ie74dcebe9412da0caceec9f541eb51ad46bfea9f
| * Fixes QTIFW-322, missing magic cookie in installer binaryMichal Klocek2013-08-231-0/+8
| | | | | | | | | | | | | | * on mac magic cookie is kept in install.dat and not in installer binary itself Change-Id: I568bbdf7a0bcf3b6efeda0bdfe2141e15c6c73aa Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Add missing defineNiels Weber2013-08-221-0/+1
| | | | | | | | | | Change-Id: I9efb25286ea16e202fa93f068b19d92ba773cb01 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Add Japanese translation.Takumi Asaki2013-08-224-3/+2475
| | | | | | | | | | | | Change-Id: I1537facf4054a27359878d114b8c9278a2bdfe19 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | fix that finishButtonClicked didn't come in every caseTim Jenssen2013-08-222-0/+19
| | | | | | | | | | | | | | | | | | | | | | - we misuse the cancel button as a finish button in the packagemanager/updater mode to have some more control if it is quited - now we connect the cancel button to the finishButtonClicked and disable the reject -> setCanceled connect for that moment Change-Id: I45182da12a5652f193b20af52262852836e29979 Reviewed-by: Rainer Keller <rainer.keller@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | fix the use of the FinishButton from script sideTim Jenssen2013-08-211-0/+12
| | | | | | | | | | Change-Id: I84a8d4400b202441272232fbdecf6996056362a5 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | code cleanupTim Jenssen2013-08-211-7/+5
| | | | | | | | | | Change-Id: I64a47e2904c36b0299846ecc58cbcb5a07beac89 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Don't break translations for word wrapping.Niels Weber2013-08-201-1/+2
| | | | | | | | | | Change-Id: I93446f7786145f3e82d3e03d3344b19ac7425b0b Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix pattern for disallowed directory namesNiels Weber2013-08-201-2/+2
| | | | | | | | | | | | | | Task-number: QTIFW-304 Change-Id: I8c59692675cb8981eb309b820f00f5b8ff81d306 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Update ChangelogNiels Weber2013-08-191-0/+2
| | | | | | | | | | Change-Id: I9b68ec498c39bd818c0a9d3a1950ff2ef24ff18f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Fix grammar in German translationKai Koehne2013-08-191-1/+1
| | | | | | | | | | Change-Id: I26ba3a4510483833126cc89d6fb8a58b4a483a73 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Display release date in Updater and PackagemanagerNiels Weber2013-08-193-3/+10
| | | | | | | | | | | | | | | | Task-number: QTIFW-25 Change-Id: I8c4d4ac3983b40afd3072fa36dec348b9c67f1d0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | fix missed patching step on macTim Jenssen2013-08-161-13/+91
| | | | | | | | | | | | | | | | - there was a problem if we have frameworks or libs with a different name than "/lib/Qt" for example phonon or libQtCLucene Change-Id: If1dec0dbeffa3d4d5a5a4e24e8d1b21e4b24f2c3 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix broken "Next" button behavior after uncheck/check of a component.kh12013-08-142-4/+10
| | | | | | | | | | | | Change-Id: I7cc36df32594a57442bc316e7c271fc00c0ad4a2 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Force updating of Essential components.kh12013-08-146-9/+49
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTIFW-38 Task-number: QTIFW-155 This is necessary for correct functioning of the Maintenance Tool. Change-Id: I3844760bdd31abf547c660f82dda14a3da38c5da Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.3' into 1.4Tim Jenssen2013-08-140-0/+0
|\ \ | |/ | | | | Change-Id: Icc3218f4f33aa455f22629d0d9f4eaa3db324ef8
| * Disallow installing over existing installation.Niels Weber2013-07-251-3/+2
| | | | | | | | | | | | | | Task-number: QTIFW-278 Change-Id: I5e435ac95c2efd699c1515592cdaaf698c3bc215 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Documented two more predefined variables.Niels Weber2013-08-128-6/+14
| | | | | | | | | | | | | | | | | | | | 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>
* | Fix selected translation in special circumstances.Niels Weber2013-08-091-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | In cases where there where multiple uilanguages, sometimes the wrong language was chosen for the Qt localisation. Also, use the standard matching for locales for the ifw translation as well. Task-number: QTIFW-324 Change-Id: I2c4cd079baa3d1ce4c5c69bf6692ba313616f722 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Make it possible to filter repositories not matching the license.kh12013-08-084-3/+20
| | | | | | | | | | | | | | 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>
* | updated with last few commitsNiels Weber2013-08-071-0/+3
| | | | | | | | | | Change-Id: I5b940bbf3b9559a26d90dbc951df59d4101d1443 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | use dependency solver to order the installed operationsTim Jenssen2013-08-067-3/+349
| | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | adding archives automatically to updates.xmlTim Jenssen2013-08-012-1/+28
| | | | | | | | | | | | | | | | | | Task-number: QTIFW-210 Task-number: QTIFW-248 Change-Id: I6deeade922dfe796df4223dae9e4a4744b7d6724 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | fix online only installer creationTim Jenssen2013-08-012-2/+3
| | | | | | | | | | | | | | | | Task-number: QTIFW-319 Change-Id: I1f66f80b952742e7ff21ee6960120271e1579fb9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Fix update component selection shows wrong package sizes.kh12013-07-303-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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 Qt5 build.kh12013-07-301-18/+18
| | | | | | | | | | | | Change-Id: Id1e0e513e979275cb206e116e19f3b6d969bd363 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | rename copiedArchives to copiedFilesTim Jenssen2013-07-303-4/+4
| | | | | | | | | | | | | | | | - they are including the sha1 files so the old name was misleading Change-Id: I6156b5590bc98ed319a093c82be32d9f79699d28 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@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>
* | existing empty dir shouldn't be a reason to cancel repogenTim Jenssen2013-07-291-1/+3
| | | | | | | | | | Change-Id: I754063a810c8d30cd26dee55e36b675885e6a4b7 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>
* | add a location hint to a warningTim Jenssen2013-07-261-1/+2
| | | | | | | | | | | | Change-Id: Ieaa10ff2e7f20dbdccbddf707923619756fea35e 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>