| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1
Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 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>
|
| |
| |
| |
| |
| |
| |
| | |
Fix breakage introduced with b2a65ce68
Change-Id: I587e9c7d681e8197fa0c967441b52ef58cfe23e6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
|
|
|
|
|
|
|
|
| |
* 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>
|
|
|
|
|
| |
Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: Ie4c97114a1f1874e239955a5d9634b1029f9c178
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I09bfdf501fdf76207ad12fa19771485ebcfbd751
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
| |
Fixes NOMINMAX and mingw missing _WIN32_WINNT define.
Change-Id: I28ea6f328b495033d484fa07181062dc92f0855f
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|
|
|
|
| |
Change-Id: If64730ba7203d1a910a426c0d9c9a738ecfeff4b
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
| |
Change-Id: I2ada7ebcc1c78fc7be536aec498721a2e83c9bac
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
| |
Change-Id: I14fe622121fe8bd859afdb256175d5889c8b34bc
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
| |
Change-Id: I89e5ae0dd83862077c6a0fa3e20f159c40213af7
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
| |
This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it
breaks compressing the meta folder (Windows 7, VS 2010).
Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I94a2408da5c5f39cf93c176a6562c851eab1facc
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
This allows compiling with gcc 4.7.
For more information see: http://gcc.gnu.org/gcc-4.7/porting_to.html
Change-Id: I1b3b62fad3c44bdeb701d961297519a2057bf76e
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
- better is to use it on existing directory
This reverts commit a240e7dbadc3f0cbcd4a483ddf7093562df8ca37.
Change-Id: I9103174eaa392a28b7a278ca9343a94b66d76e80
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
|
|
|
|
|
| |
Change-Id: I8d371045bb500f8954a42523f8d5024b04309ceb
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
|
|
|
|
|
|
|
|
| |
- but at the moment the directory doesn't exist so the only thing is to
get that information from the last char
Change-Id: I96ecc086ca19047dc0a3ae57262e903ae8923535
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- in older code there was a try to resolve junctions like symbolic links,
but this broke many other code
- we copied the read windows symlink code from the private qt file and
made small adjustmenst to be able to call it directly in targetPath() method
- and changed the isValid behaviour, because we want to create links to
locations which are created later
- and it is creating the path to the link on every OS
Change-Id: Id11839bbf2ecfde410982833d10f96d36fe1cab7
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I83dd005fa3ee3732cb1884deb87c1bfebbbe3237
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
|
|
- replace read junction link target code with already existing Qt code
Change-Id: I6642f19ceb9a907791987ced8e9eacc6ca4f2780
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
|