summaryrefslogtreecommitdiffstats
path: root/src/libs
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Use correct value for RunProgram."Niels Weber2013-11-271-2/+2
| | | | | | | | | This reverts commit a1cab8ea0e8e779f781f827888f1a485ec2f8d64 This breaks other use cases. Change-Id: I1137a5bcfb927315a937b33c18d329404b5d4bac Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* Use correct value for RunProgram.Niels Weber2013-11-141-2/+2
| | | | | | | Task-number: QTIFW-397 Change-Id: I4f9fe8691f904268177bd81a471a6249328d4ce9 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Read file content in case mmap fails (fallback).kh12013-11-121-6/+20
| | | | | | | | Task-number: QTIFW-400 Change-Id: Ic1bc25b7bc1ada6b12b7967c4c41e65f64e81267 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* do not reset registered archives in installer caseTim Jenssen2013-11-071-2/+2
| | | | | | | | | - that reseted registered archives which are read from the binary content class which is only done once at the start of an installer Change-Id: I74da50276e28094555f4e7960b1a92a49b729236 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Restart on the wizard needs to cleanup component left-oversTim Jenssen2013-11-0611-26/+103
| | | | | | | | | | | | | | | - use two different script engine instances - one which lives from the beginning -> the controlScriptEngine - the other one which will be reset if there are some new repositories loaded - now the core has a pointer to the gui object, but it should only be used by the script engine so a QObject type should be enough - engines are deleted as QObject children from the PackageManagerCore - registered downloaded archives are removed Change-Id: I60a4a32fb2e409059839ec11b10c57357454f57a Reviewed-by: Michal Klocek <michal.klocek@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* prepare script engine to get the gui object laterTim Jenssen2013-10-292-20/+24
| | | | | | | | - Since we need two different script engines we need to be able to set the gui object later Change-Id: Ie40f8ec3dd84dc4d5b3cf127c3e41ce25ef53b66 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* remove unused class forwardTim Jenssen2013-10-291-1/+0
| | | | | Change-Id: I51d19bb2dac3ffe84f905bf187d361c04694f72d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* fix that restart is only triggered if the user wants itTim Jenssen2013-10-232-2/+2
| | | | | Change-Id: I7814e94819088a4ee82fea9a120d99be6f63d934 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* rename forceRestart to needsHardRestartTim Jenssen2013-10-235-9/+16
| | | | | Change-Id: Ic3e3b6733f3d4e7bbf7b9a2715fd2d74fb3f9a2d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix the copy error messageMichal Klocek2013-10-171-1/+1
| | | | | | Change-Id: I14f46f8567010b3ce8ac3b7e37ff61eed5015d39 Reviewed-by: Petref Saraci <petref.saraci@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Compile fix.kh12013-10-161-1/+3
| | | | | Change-Id: I917cb0da36b6d68df85cbc037602c4abf754ded8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Implement a way to replace the default resource.kh12013-10-163-18/+55
| | | | | | Change-Id: I2e362d255bf2526f216cbb872bbb64d37383d229 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* keep the old patch file list up to dateTim Jenssen2013-10-153-2/+16
| | | | | | | | Later we can remove the versions without any version ending, but currently we have some old components which are using this. Change-Id: I593b46a23807b0e64fd86e543b28951e23424a3c Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Fix broken dependency resolverMichal Klocek2013-10-141-1/+3
| | | | | | | | * dependencies can have versions * remove version before sorting dependecy graph Change-Id: Iceefd7939fffcb5c5ad94d0e915de9e2d6eba172 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix target dir for root installations and empty AdminTargetDirKai Koehne2013-10-111-1/+1
| | | | | | | Make sure e.g. '@homeDir@' is replaced also in this case. Change-Id: Ife5b2d88e19abdab8b9264c5db09c1d9b5c13916 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Connect extract operation to progress calculation.kh12013-10-094-14/+38
| | | | | | | | | | | | Ignore senders which are sending 100% more then once, got that from 7z lib at the extracting step. Task-number: QTIFW-11 Task-number: QTIFW-141 Change-Id: I7750f9e49d5705df91e6c79c7ee2b0530e156e84 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* make replacing installer base binary more verboseTim Jenssen2013-10-071-2/+10
| | | | | | Change-Id: Ib11b3cfa4121241421d479af23ed0ee111c0069c Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* remove possible leaks of the real urlTim Jenssen2013-10-071-9/+9
| | | | | | Change-Id: I630105db27a52b85b8c1da859aa35a2442c8cee2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* ignore filtered repositories as early as possibleTim Jenssen2013-09-301-7/+12
| | | | | | | | | - we had a recursion if a repository was added which was filtered later again Change-Id: I980a613fa75de42940ec49b941e302f1bf326ca9 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* fix that setTemRepository added child repos to the default onesTim Jenssen2013-09-301-1/+22
| | | | | | | Task-number: QTIFW-373 Change-Id: I30646ef084d9ec6f3a393992a9c96e1f77dbf3d9 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* remove slotCurrentPageChanged and call it directlyTim Jenssen2013-09-302-11/+4
| | | | | | | - also renamed it to better name: executeControlScript Change-Id: Id2bb7cada2386561c2b25b158c6aa101382e5cc4 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* move creating the temp remoterepo dirTim Jenssen2013-09-271-13/+13
| | | | | | | | | - in case we are getting a new repository it gets a reset which starts from the beginning. So it is better to create that at the end. Change-Id: I6613ce899fd695e6df8825290a7d945a67d61168 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* We can't expect a multiple of 8 during marker search.kh12013-09-241-1/+1
| | | | | | | | | Once the marker was on a position not matching a multiple of 8 from the end, the search would fail. Now decrement by 1 byte. Change-Id: Ia703c9074b3bef6b1a300865abfe24dcb2c8d5fd Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Add Qt5 specific windows-emb-arm-qt5 patch fileIikka Eklund2013-09-242-0/+14
| | | | | | | | | Keep the current windows-emb-arm for qt4 packages. Change-Id: I6ddbd89bc74b2ee6c42bd0858e32511ed1209e22 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix broken random name generation for temporary directories.kh12013-09-203-10/+14
| | | | | | | | | | | | Task-number: QTIFW-354 The function was correctly calculating the initial part of the name using QTemporaryFile, though the appended "meta" was not checked and could result in duplicated names later on. Change-Id: I00eeebbb01fbfcc5a626e4bdfe04013f8e520ed5 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Small cleanup.kh12013-09-202-18/+12
| | | | | | Change-Id: I4c0732ac03dc98bd5ed59b6924d551c2303db407 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Rename iOS specific files-to-patch file to reflect qt5 contentIikka Eklund2013-09-192-1/+1
| | | | | | | Files without "qt5" are considered qt4 content. Change-Id: I92ddb93374570caab19db26d57b494a8eac50268 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add a comment to progress calculation.Niels Weber2013-09-181-4/+5
| | | | | Change-Id: I16696eaec19a4563f647f4337a863b39868aed4d Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add separate files-to-patch list for Qt5 in embedded armSamuli Piippo2013-09-182-0/+13
| | | | | | | | | This includes .pri and .cmake files which can have original build dir in them. Change-Id: I62120a1233d516dcfd163da531d72285bdc578b0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* transform progress misscalculations warnings to debugsTim Jenssen2013-09-181-2/+2
| | | | | | | Task-number: QTIFW-243 Change-Id: I5314da8ebc41de2e534f320ca3a44603797cfe59 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix incremental buildsMichal Klocek2013-09-171-2/+1
| | | | | | | | | The missing dependency to installer library causes corrupted incremental builds, installerbase should be rebuild when installer lib is changed. Change-Id: I588577f3d178c70dff2d84747f221d924e5cf38e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Don't show RunProgram after uninstall.Niels Weber2013-09-171-1/+1
| | | | | | | Task-number: QTIFW-366 Change-Id: I34989f184a1d95d7e9aed0e3331c1b4ac8b32b52 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix not moving uninstallation progressBarMichal Klocek2013-09-171-0/+2
| | | | | | | | | | Set 'component' name value for minimalprogressoperation. Wihout the value sortOperationsBasedOnComponentDependencies puts the operation to execute as the last one. This creates 'freeze' of uninstallation bar Change-Id: I3b894b2c48ed5008d1d265084451da6fc4e3ef86 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix starting the app when installation finishedMichal Klocek2013-09-171-1/+1
| | | | | | | | | Do not pass as arguments empty string, it can break applications which expect for example filename as first argument. Change-Id: I5c7dd1e2fc9b441634507ad651108d2d03416224 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* convert FinishButton only at isUpdater and is isPackageMangerTim Jenssen2013-09-131-4/+4
| | | | | | | Task-number: QTIFW-362 Change-Id: Ia94e06ba7a5d8126b12935c33642b53bbd4563e9 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Minor. Fixes unregistered type warning.Michal Klocek2013-09-131-0/+1
| | | | | | | register QList<QInstaller::Component*> Change-Id: I1329ccc9c7ad3405b3a995fb40cc77688953744a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add support to pass a query string when downloading archives.Niels Weber2013-09-132-4/+7
| | | | | | | Task-number: QTIFW-329 Change-Id: I645370f03958164905c064d1dcf0be97fd8dc039 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Bugfix ported from 1.5 branch on customer requestMichal Klocek2013-09-131-3/+0
| | | | | | | | | | | Remove some superfluous qApp->processEvents(). This shouldn't be there, as it forces event handling in certain situations which break other parts of the UI event handling. We experienced a missing redraw which caused hacky workarounds. Original gerrit id: I2185ecb1b99d1ff20caa9a08637d77100e520445 Change-Id: I46f028838d680ba46183df6d0368811eb041d2e2 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Minor. Make dynamic pages look alikeMichal Klocek2013-09-131-1/+1
| | | | | | | | Force subtitle for dynamic pages Change-Id: If54df3d275bfca1438717c7b2eaa55fac841b788 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Rewrite function to use QFile::map().kh12013-09-101-26/+20
| | | | | | | | | 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>
* 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>
* | 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>
* | 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>
* | 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>
* | 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>