summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* fix generation of random temp directory nameTim Jenssen2013-12-101-6/+49
| | | | | | | Task-number: QTIFW-427 Change-Id: Id398f810e8bf4488919297581298307ed3251d28 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* add missing ProductKeyCheck::init at checkupdates caseTim Jenssen2013-12-091-0/+2
| | | | | Change-Id: Ic1f7977f90a507c2b4dc3dbc1d08a525b12e5ed7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* MaintenanceGui should also show productkeycheck pagesTim Jenssen2013-12-041-0/+8
| | | | | | | Change-Id: Ie1d7183e6420a17f34d7d199e80c34ab8e3d6db2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Enhance debugging output if process crashedKai Koehne2013-11-282-2/+8
| | | | | Change-Id: I411bd70100a0c16bd2e5422d00f744a0aeca7f3f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Wait longer for commands to return, but don't try excessivelyKai Koehne2013-11-282-4/+4
| | | | | | | | | So far we forcefully killed the executable if it wasn't done after 3 seconds, but re-tried 60 times. It's saner to let the app run for 10 seconds maximum, and only re-try 3 times. Change-Id: I41ccf2fdb464f58834c333ab69c4f2738e8365fc Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Don't re-use QProcess in different triesKai Koehne2013-11-281-2/+1
| | | | | | | | | | | | | Don't assume you can recycle the QProcess object when trying again. Instead create a new one every time ... This is also what QtPatch::qmakeValues does, and prevents spurious Warning: QProcess::start: Process is already running errors. Change-Id: Iae4904d24998c8ebeb460457b96d5adaaea99bf0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Reuse http proxy settings for https.kh12013-11-281-2/+4
| | | | | | Change-Id: I364066264072c91dae376eb4d7e3bda70688269e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* qmake crash should be a warning outputTim Jenssen2013-11-281-1/+2
| | | | | | | and adding the exit code to that output Change-Id: I1b30beffd2001a795735f83f421bb91c41683dd8 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Introduce function to set repository settings page visibility.kh12013-11-282-0/+6
| | | | | Change-Id: Id61a2817561013c6fa85ddbca459b385d24de3e7 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Allow a page to force showing the settings button.kh12013-11-284-3/+10
| | | | | Change-Id: I433933c7f0a398d2d7cd082db61e41507510c2ab Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* read the output even if qmake crashedTim Jenssen2013-11-281-2/+2
| | | | | | Change-Id: Ib9258b23610db4633c390d3a093b581c2f4c1c84 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* revert some changes in ProductKeyCheckTim Jenssen2013-11-262-0/+12
| | | | | Change-Id: Ic244d5d66eb2df7a34fe7dabb1a2b15438c34a95 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* compile fix in genericfactoryTim Jenssen2013-11-261-2/+2
| | | | | Change-Id: Id7b7e68b76c7207ae2ed4c91fc5a18673818bb3c Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Compile fix.kh12013-11-251-2/+12
| | | | | Change-Id: I7feea895a3eb2e3310dbddf417506ae5d7ed0915 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Adjust ProductKeyCheck API. (in preparation for multiple pages)kh12013-11-2510-55/+26
| | | | | Change-Id: I69d0fc9842df7fb564db57067da5f40e002b61de Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Implement factory to be able to insert pages dynamically.Tim Jenssen2013-11-257-11/+170
| | | | | | Change-Id: Ic358a820148670da85a1b374abd08103eaa995de Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Open a console window (Windows) to show the verbose output.kh12013-11-251-1/+10
| | | | | | | | Task-number: QTIFW-403 Change-Id: I5ab5221e8035e7d47c8d368c552f930db65931d9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Move TestRepository from sdk to own file in installer libSamuli Piippo2013-11-205-165/+269
| | | | | | | | Moved the class to installer lib so it can be reused in ProductKeyCheck as well. Change-Id: I8b207f4816505671fa05ebf602895978e04d13e9 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Add missing Settingsoperation.Niels Weber2013-11-191-0/+2
| | | | | | Change-Id: I91fbead5d765557d3266fe2d78235c4726c65cfa Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* add new settingsoperationTim Jenssen2013-11-145-2/+321
| | | | | Change-Id: I3c05c51241a19304b43c0fc4f1306b36b6a84c86 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* use removeSystemGeneratedFiles in createlocalrepositoryTim Jenssen2013-11-131-2/+1
| | | | | | Change-Id: I9ac5270c021425d4aa6d1e5873afded550788a35 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* remove unnecessary else statementTim Jenssen2013-11-131-6/+2
| | | | | | Change-Id: Iaad2801d5f9700e64e4a44264b57dfaf31f419e6 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2013-11-131-6/+20
|\ | | | | | | Change-Id: I0bba1ced9316861cb6723ec1677a4d01e3b91d2f
| * 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>
* | Offline installer do not require any temporary space.kh12013-11-131-2/+3
| | | | | | | | | | | | | | | | Though not a real fix, it is still part of QTIFW-395. Change-Id: Idcde0dbd6b578fe900fc3ea3f11a68a90ff1f122 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2013-11-071-2/+2
|\| | | | | | | Change-Id: I559345600da059e456ea61faac5ba33c66fa0e3c
| * 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>
* | preprocessor buildfix for MacTim Jenssen2013-11-071-1/+1
| | | | | | | | | | Change-Id: Iae181f230cf20651fc5820fe54c4ae493cfb67cb Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2013-11-0613-47/+127
|\| | | | | | | Change-Id: I2725f9bacbe04240dc3f97062c5ebc50884822c8
| * 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>
* | Wrong variable in use, fixes fd26174d2cf on unix.kh12013-11-061-2/+2
| | | | | | | | | | Change-Id: Ibd70015fc18d8a19f29175fd94593b120c0255ff Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Introduce ApplicationsDir variable.kh12013-11-061-0/+20
| | | | | | | | | | | | | | Task-number: QTIFW-258 Change-Id: Ie08884c01c62e40104dce0dba8ef85c5194d7207 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Always only delete the install directory if it's empty.kh12013-11-062-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | We have to reset the force removal flag inside the operation to not delete any other files/ folders than our own created. Once the flag is set to false, the operation will fail on any file/ folder still left in the install path. Note: the config.rcc is a dummy file to calm down settings class parser warnings. Change-Id: I66efb5836e310bdb1b64e5647ee76c058cea2a7e Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Environment variables changes are not propagated to the system.kh12013-11-061-12/+9
| | | | | | | | | | | | | | | | | | | | | | Note: we already used the Unicode version of the function call, though without passing the right LPARAM. Might fix the issue... Task-number: QTIFW-391 Change-Id: I28e0afd45ea7e4d1b904dcf8357fc990dec6767a Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fix virtual function being hidden error.kh12013-11-052-2/+2
| | | | | | | | | | | | Change-Id: I7b4072a11df9f06a45c11dfc4268e1cfc63ccb53 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Build installers with accessibility pluginTim Jenssen2013-10-251-0/+3
| | | | | | | | | | | | | | | | | | This change makes the installers work with screen readers. Task-number: QTBUG-34296 Change-Id: I87cf313657d9eaa31f4cd89729b4e298880ae99e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2013-10-2333-208/+352
|\| | | | | | | Change-Id: Ib2d382d1aa398b642dc15f4df7c03b19bf638546
| * 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-172-2/+2
| | | | | | | | | | | | 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-164-18/+60
| | | | | | | | | | | | Change-Id: I2e362d255bf2526f216cbb872bbb64d37383d229 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
| * Be more verbose on the resource tree.kh12013-10-161-17/+9
| | | | | | | | | | Change-Id: I1e079f94767d95d997ebb6d758c40e605fd36c75 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Make sure we parse and pass arguments as early as possible.kh12013-10-161-53/+53
| | | | | | | | | | | | Change-Id: I384f036a24e3eb648bde0fa8e40ab8dcb0779e7b Reviewed-by: Michal Klocek <michal.klocek@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@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>
| * Compile on mingw.kh12013-10-151-8/+3
| | | | | | | | | | Change-Id: I2a9a85e88dffa62af57c8502533a0c131ecf1b8e Reviewed-by: Christian Stenger <christian.stenger@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>