summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/consumeoutputoperation.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.0'Katja Marttila2017-01-301-17/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Changelog dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri src/libs/installer/lib7z_create.h src/libs/kdtools/kdgenericfactory.cpp src/libs/kdtools/kdgenericfactory.h src/libs/kdtools/kdupdaterapplication.cpp src/libs/kdtools/kdupdaterapplication.h src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp src/libs/kdtools/kdupdaterupdatesourcesinfo.h src/libs/kdtools/localpackagehub.cpp src/libs/kdtools/localpackagehub.h src/libs/kdtools/updatefinder.cpp src/libs/kdtools/updatefinder.h tools/binarycreator/resources/mkdmg.sh Change-Id: Iab2513f549832d2e750e77131c673457ab265af4
| * License header update to GPL-EXCEPTKatja Marttila2017-01-261-17/+12
| | | | | | | | | | Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1 Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
* | Merge remote-tracking branch 'origin/2.0'Iikka Eklund2016-01-201-4/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: installerfw.pri src/libs/kdtools/kdgenericfactory.cpp src/libs/kdtools/kdgenericfactory.h src/libs/kdtools/kdupdaterapplication.cpp src/libs/kdtools/kdupdaterapplication.h src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp src/libs/kdtools/kdupdaterupdatesourcesinfo.h sync.profile Change-Id: Ifdc8b065f89b7e241bd3788ed79768e21888161f
| * Update license headersIikka Eklund2015-12-291-4/+3
| | | | | | | | | | | | | | | | | | Update existing license headers. LGPL -> LGPLv21. Update copyright year as well. Change-Id: Ie1d71f8c68186b8f625f409ddf94691f178093c9 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Make use of the new varadic template feature + cosmetic changes.Karsten Heimrich2015-07-101-1/+2
| | | | | | | | | | | | | | | | Change constructor to take the a package manager argument. Add a package manager member to the operation. Remove setter function. Change-Id: Iffb860e24089beb6496ac4ee479d547a29463728 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Sanitize QDebug outputKai Koehne2015-07-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Prefer using the stream operator logic instead of using QString::fromLatin1. Add a noquote() where a QString should be printed without any quotes/escapes. This also fixes the tests with Qt 5.5, where QString's are further escaped. Change-Id: Ie3afd14b9355101d3c0b52f30f66ec759c76526c Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Remove superfluous clone() method. Prepare for next patch.Karsten Heimrich2015-06-251-6/+0
| | | | | | | | | | | | | | Task-number: QTIFW-180 Change-Id: I6aa8b409e323d14e353a1f80b0b2ec54daad184f Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Add getter and setter for package manager.Karsten Heimrich2015-06-241-1/+1
| | | | | | | | | | | | Change-Id: Iff8ac5fc97f73939e0cbfea21370bb63e94b7782 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Unify translated error messagesKai Koehne2015-06-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | * Enclose file paths in "" * Localize file paths with QDir::toNativeSeparators. * Make sure sentences end with a '.' * Append error details always by ':', e.g. tr("Failed to copy file '%1': %2").(...) * Use 'directory' instead of 'folder' everywhere Change-Id: Ie045f429f72ad5045c96537465c5fb9d2e99d250 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Fix reading and checking arguments of CreateShortcutOperationJarek Kobus2015-03-111-2/+2
| | | | | | | | | | | | | | Change-Id: I348f4985c268fabec9cc53424aea5adc2bfd1e46 Reviewed-by: Christoph VogtlÃĪnder <c.vogtlaender@sigma-surface-science.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | CleanupJarek Kobus2015-02-271-6/+3
|/ | | | | | | | | | | | | | | 1. Add a checkArgumentCount() helper method. 2. Fix a plural form of the check method. 3. Remove repeating translation for every UpdateOperation subclass. 4. Use always QList.at() for checking arguments, instead of random usage of first(), last() and at(). 5. Fix const corectness. 6. Move isPersistant into #ifdef Q_OS_WIN inside EnvironmentVariableOperation. Change-Id: Idaa12265f1816871de0a4ea3ae586512859a04e3 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Update CopyrightKai Koehne2015-02-181-7/+7
| | | | | Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Add LGPLv3 as new licenseKai Koehne2014-10-161-14/+7
| | | | | | | Change-Id: I61158f956894e209dccf83744b4753774676099d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* Improve error message for ConsumeOutputOperationKai Koehne2014-04-251-3/+3
| | | | | | | | | Avoid a warning that e.g. 'qmake.exe.exe' does not exist, when the argument was qmake.exe. Task-number: QTBUG-38343 Change-Id: Icdfc8ffc8e112b23fb0e789d6041ea7eefaf55c3 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* ConsumeOutput: Use local encoding to parse executable outputKai Koehne2014-04-231-1/+1
| | | | | | | | | We don't really know which encoding the app will use. local 8 bit seems to be the best bet though. Change-Id: Ic4d8668ed5f5a6eca55d44348ae54adb903bf447 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Enhance debugging output if process crashedKai Koehne2013-11-281-0/+4
| | | | | Change-Id: I411bd70100a0c16bd2e5422d00f744a0aeca7f3f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Wait longer for commands to return, but don't try excessivelyKai Koehne2013-11-281-2/+2
| | | | | | | | | 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>
* Do not use don't, can't ... in outputKai Koehne2013-06-201-1/+1
| | | | | | | | | | Don't, Can't, etc abbreviations are used in informal speech. This is okay in code comments etc, but user output should use the correct, non-abbreviated terms. Change-Id: I53c0dfa91596c151bfa7ef7b65f57d5084ceccde Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* adding ConsumeOutputOperationTim Jenssen2013-06-031-0/+158
- 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 18:45:29 +0000