| 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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This introduces a new 'VerboseWriterOutput' interface which can be
reimplemented to perform writing the installation log file by different
means. For now, there's just a standard QFile-based implementation. The
plan is to use this facility for implementing log writing via
RemoteFileEngine.
Change-Id: I89d91a4c7a146401ca96f27b25c49558099c5bb7
Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch introduces a (yet unused) VerboseWriter::flush() method which
can be used to explicitly trigger flushing the installation log. This
permits clients to decide when to do the flushing instead of having to
rely on the destructor being called.
The destructor will call flush() if needed - whether flushing is needed
is defined in terms of the 'perFileBuffer': if it's open, flushing is
needed - otherwise, no flushing is needed.
Change-Id: I17f1df96e5ddf3b6f613d647c28b90b6973c9393
Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
Mimic the logic implemented in installerbase/QTranslator::load() by
- using QLocale().uiLanguages()
- splitting up the locales into candidates (first en-US, then en ...)
- implicitly assuming the default is English
Task-number: QTIFW-390
Change-Id: I294288d5fc739ebf12c93a0e1a43d613b3834721
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I805926a241d31f3ae6846a7429b99af4f68169fe
Reviewed-by: Kai Koehne <kai.koehne@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>
|
|
|
|
|
|
|
|
|
| |
This class does not need to be a QObject.
Also, rename 'setOutputStream' to more accurate 'setFileName'.
Change-Id: Iefb5997bb1ee1d5c54fa9abbdd3ad81f5d9a49d8
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Let VerboseWriter solely handle logging to the destination file.
qt_message_handler takes the role of logging to cout. This allows
us to get rid of the twisted stream logic in utils.cpp, and
furthermore let us get rid of the buggy debugstream.
Change-Id: I5cf2e41b126a90025825a0d93f95b41d783ef22a
Task-number: QTIFW-524
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|
|
|
|
|
| |
Change-Id: I6efc3ef90f8797b71a795f62423eda96f61934e5
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
| |
Still based on what we had already, though more separated.
Change-Id: I4cce298003a4ffc2ebcec01fea1a07adfbfdf990
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Fixes NOMINMAX and mingw missing _WIN32_WINNT define.
Change-Id: I28ea6f328b495033d484fa07181062dc92f0855f
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
| |
Change-Id: Ibc7d4ea8319b48b908adad75aa3a43858667cdde
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: If64730ba7203d1a910a426c0d9c9a738ecfeff4b
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTIFW-216
Change-Id: I0e0ed02f3f57e5f6be964356ac65980947dbaf79
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
| |
Change-Id: I2604c77418e4a930bd0f76092db581fef1e45817
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: Ie6a3ba7b3c0b24fc292d0d7444ae920dfa866a54
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: I294038888bd47a139b8c3df68e298e66e5ec2202
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
Change-Id: I01fb12537f863ed0744979973c7e4153889cc5cb
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
|