summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile fix after native separator change.kh12014-02-042-1/+4
| | | | | Change-Id: I3044637a65b87483dd9ded63920adb5536952700 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update German translation.Niels Weber2014-02-031-348/+481
| | | | | | Change-Id: I9507ea080d40164d71ebe0fca77b8832160f5885 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix: Path handling in project filesTakumi Asaki2014-02-032-5/+5
| | | | | | | | | | | Because of cleanPath() converts native separators to '/', call toNativeSeparators() after cleanPath(). Due to warning message from "if (exists(filePath))" on Windows, if() around the exists() are removed. Change-Id: I412fe83f13365c8eec00e119270d07ce7f72297d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Updated ChangelogNiels Weber2014-01-291-0/+9
| | | | | Change-Id: Id996cb850382100028cd56cbf323361ef5319155 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2014-01-291-427/+504
|\ | | | | | | Change-Id: I6d741760ea725561c48de663489d64eab50206ae
| * Updated German Translation1.4Niels Weber2014-01-291-427/+504
| | | | | | | | | | | | Change-Id: I7731cb04e09cf5fc1c0f155874523397c1f26bb3 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Bump version numberNiels Weber2014-01-294-6/+5
| | | | | | | | | | Change-Id: I22bda59c70f54336d82dc9bbbedf9330b47478c8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Update Japanese translationTakumi Asaki2014-01-271-255/+357
| | | | | | | | | | | | | | Change-Id: I118318f9fe2bba175698b431d849878f1b97ef0d 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: I18N doesn't work on WindowsTakumi Asaki2014-01-271-5/+5
| | | | | | | | | | | | | | | | | | | | Qt expects QM files is placed in case-insensitive file system on Windows. QIFW loads QM files from QRC and QRC is case-sensitive file system. Change-Id: I1965ec2344e2db6315e84a25ebb3098b11f611c6 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | fix that QSKIP has one argument since Qt 5Tim Jenssen2014-01-222-3/+15
| | | | | | | | | | | | Change-Id: I134f61e1ea9a50264a155799d447965beaab14f9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | move the currentDateTime to the constructorTim Jenssen2014-01-222-2/+5
| | | | | | | | | | | | | | | | It was crashing on Qt5 because the currentDateTime uses QLocal::system Q_GLOBAL_STATIC which could be already deleted. Change-Id: I10ff1b02a72baccbe0acd2d0f54e187653abaa04 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | fix random crash while accessing argumentsTim Jenssen2014-01-211-1/+1
| | | | | | | | | | | | | | | | | | The problem is that QCoreAppliction changes these values in some cases. (Most often crash was when XCB was trying to get the qApp->arguments()) Change-Id: I41086f662dbead854864a29b2566355c6360b011 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | ApplyProductKeyOperation::performOperation should return correctlyIikka Eklund2014-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The ApplyProductKeyOperation::performOperation should return false whent the actual operation has failed. Currently even if the operation fails and returns false the installer will keep on installing without user interaction. Change-Id: I68020f8200cebbc45bca164d66fb876e170f3721 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fix --checkupdates shows error dialog if network is down.kh12014-01-086-170/+232
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTIFW-431 We need to add a separate console window in case we run on windows, though we can't use a gui application as the lib might popup message boxes. (MessageBoxHandler checks against a running core application) Change-Id: Idad8dff44c6c0bfb0bb45e8a0fb408b3db832c3c Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Another try to compile on mingw.kh12014-01-071-0/+6
| | | | | | | | | | Change-Id: I354564e5dcd6cd0c342f19cf8e2a88a91a8974ab Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Compile (maybe).kh12014-01-071-0/+1
| | | | | | | | | | Change-Id: I353cb9a1f06a686dcadf41757efb6eb67fa9d42c Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Use qt_windows.h.kh12014-01-078-47/+9
| | | | | | | | | | | | | | Fixes NOMINMAX and mingw missing _WIN32_WINNT define. Change-Id: I28ea6f328b495033d484fa07181062dc92f0855f Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Bump version number1.5.0Kai Koehne2013-12-123-6/+6
| | | | | | | | | | Change-Id: I65234496a41f1d3561261b1612f62cf60406ab59 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Updated Changelog.Niels Weber2013-12-121-0/+17
| | | | | | | | | | Change-Id: I74d947784b95ef6d79943ea3b174b6fe4525b67d Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2013-12-121-0/+19
|\| | | | | | | Change-Id: I1e88555712a6a3a190db9dcd082b2da02abfa64f
| * Updated Changelog.Niels Weber2013-12-121-0/+17
| | | | | | | | | | Change-Id: I11297e725b8221729f40b63f3f31435b416d7e27 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Merge remote-tracking branch 'origin/1.3' into 1.4Tim Jenssen2013-12-121-0/+2
| |\ | | | | | | | | | Change-Id: Ibde2ecef36278bc4d71219035ad1946493e158fb
| | * Update ChangelogNiels Weber2013-09-171-0/+2
| | | | | | | | | | | | | | | Change-Id: I4b29a82ef1fc9075d4ec298071298fc642b9b6f4 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * | 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>
* | | 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>
* | | Add a line to documentation that operations are threaded.Niels Weber2013-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTIFW-251 Change-Id: I51488889e3d68a10d5f54856f538eeb50eb00ff1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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>
* | | small fixes in TestRepositoryTim Jenssen2013-11-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | - move TestRepository to namespace QInstaller - add export makro Change-Id: Ia6ab5b4e029cae14bab8f4a1391ea40ce1d246aa 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>
* | | Document the existence of addElevatedOperation.Niels Weber2013-11-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTIFW-407 Change-Id: I885cc8432ceffae48e94f165f415baa0e54155c2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@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-148-4/+657
| | | | | | | | | | | | | | | 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>