| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Languages with double '_' characters in language name were not parsed to
resources due to bug in qmake parsing.
Task-number: QTIFW-3325
Change-Id: I55c58db8c4257eedd90ba2ca2c37923de5745ffa
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
|
|
|
|
|
|
|
|
|
| |
Squish SOURCES were overwrited in the pro file which caused a fatal
error when including squish into build
Task-number: SQUISH-15697
Change-Id: Ifd9feed64a2a72897e877cdb6b59959509ecf628
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Introduce ConcurrentOperationRunner class used for running
installer operations concurrently in the global thread pool.
Add execution groups for operations; Unpack operations are run
concurrently for all components requesting installation,
operations belonging to Install group are run sequentially for
sorted components one at a time as before. From the default
registered operations the Extract op is moved to Unpack group.
Move the previously on-the-fly backup steps of Extract operation
to the ExtractArchiveOperation::backup(), so that backups are
done before any archives are extracted, and that we know if any
of the archives requires administrator privileges to unpack.
Reparent QInstaller::Error to QException to support throwing
and catching exceptions across thread boundaries.
Use RAII for the server-side objects of the classes supporting
the remote client-server protocol of installer framework. The
concurrent extraction revealed that it was still possible that
the local socket was disconnected and thus the RemoteServer-
Connection thread finished before receiving and processing the
final "Destroy" command packet, leaking the dynamically
allocated objects.
Task-number: QTIFW-2566
Change-Id: Ib8c2928b9405b7b3465c731018df73acb51e949f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
|
|
|
|
|
|
|
|
|
| |
Also enable linking qtimageformats as a static plugin on macOS,
it is required to read the .icns file to be shown on the dialog.
Task-number: QTIFW-2453
Change-Id: Ib776635167a4c90ffa20a91ecc447d2d73f5aeb9
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Standard input is possible in Windows only in console application. This
change makes installers to be console applications by default. If
started as gui from command line, console is released and application
is restarted so cmd.exe won't be waiting for application to finish.
If started from explorer, console is launched but released immediately.
This may be seen on screen with short console flash.
Using command line interface messagebox strings and possible answer
values for it are printed to console. Answers must be given in case
sensitive format as StandardButton QMetaEnum is utilized when reading
button values. This ensures that if StandardButtons are
added/removed/changed the code continues to work.
Also added a new option 'default-answer' which will answer the questions
with default button values without user interaction.
Task-number: QTIFW-1739
Change-Id: I710f921f5c927dbd13090af32f93656dded84e72
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Rename and alter the description of some command line options
according to validation results from task QTIFW-1635. The
suggested additions are not added in this change.
- Remove options "framework-version" and "silentUpdate", these
should not be needed anymore.
- Combine options "installPackages" and "installDefault" into
single "install" command.
- Change command line syntax from "binary [options]" to
"binary [options] command <arguments>".
- Re-order & group known option variables and "--help" printing
order based on their topic.
- Move CommandLineParser class files under src/libs/installer
and add private class for future options extension.
Short versions of command line options should be added in a
follow-up commit.
Task-number: QTIFW-1671
Change-Id: Ie0d393368b5275c8ffa1ab8833885b149af3178e
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
|
|
|
|
|
|
| |
Task-number: QTIFW-1633
Change-Id: I207cd152a471fddd51c152223460f8a9873f4382
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
|
|
|
|
|
| |
Change-Id: I657645f2126813a93bc38626fabf46deb4711791
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
|
|
|
|
|
|
|
|
| |
Specifically, add support for falling back to a qt/base translation
without country qualification.
Change-Id: I87bed68f426aafc1ec06b410a7735a62e5c44924
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
|
|
|
|
|
|
|
|
| |
that makes it possible to update the templates even if the ifw itself
cannot be built (e.g., due to using a -no-widgets qt build).
Change-Id: Ie170e6524dbed40f6c8b837e35af6b45a1c2d2dd
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change enables building IFW with Squish support by passing SQUISH_PATH
to qmake when building IFW. Also enables runtime change of Squish port
with command line option --squish-port <port number>. If no port is set,
default port 11233 is used to attach to Squish.
Change-Id: I4821b360031df66968d3592886c2e45598e1b097
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
|
|
|
|
|
|
|
|
| |
this makes it easier to integrate ifw into the surrounding
infrastructure.
Change-Id: I7918830b7a6c29d8556911eec83a3b6530478d84
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
|
|
|
|
|
|
|
| |
this is the standard way to start a new translation.
Change-Id: Ie0235e41e39484af0b832a9b7488501bc883aaea
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
|
|
|
|
|
|
|
|
| |
this file is merely a placeholder. there is no point in it being in the
repository.
Change-Id: Id07be46a9fa0c2eb14cbc567cb95e67c00f18b02
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
instead of using a hand-crafted qrc file, auto-generate one. this allows
us to collect available translations dynamically, which means that we
don't need to limit ourselves to the state of qt 5.5.
as a side effect, this removes the possibility to compile the qt
translations ourselves. i'm not sure what the point of that was, as
every qt installation would have pre-compiled qm files.
Change-Id: Ie88327e848c2498eb2a63a895a80e1cd603619b8
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
|
|
|
|
|
|
|
|
|
| |
the pattern *_?? (meant to exclude *_untranslated) doesn't match
ifw's translations without a country code, because they have only a
language code. use two patterns instead.
Change-Id: I5c0f67c339053281dfbee1bcd16b03ac6ca1b6e2
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Unattended installations typically use no UI, and the documentation
recommends passing '-platform minimal' (note: one dash!) to hide the UI.
Alas, the command line parsing is not implemented in terms of
QCoreApplication::arguments() which means that even the -platform
argument which is meant to be processed by QApplication is interpreted
by the command line parser -- which then complains about the unknown
switch by printing
Unknown option: p, l, a, t, f, o, r, m
Let's avoid this by just registering a dummy '--platform' switch
ourselves. It has no effect, but avoids the warning. This however means
that two dashes need to be used, because that's how the command line
parser works.
For what it's worth, there is also a 'gui.setSilent()' setter, but it's
not quite as comprehensive as using the 'minimal' platform plugin: using
setSilent() will still create a QApplication and thus create e.g. a task
bar entry on OS X (and I suspect it requires an X connection on Linux).
The 'minimal' platform plugin apparently avoids this.
Change-Id: I8cd4cfd496f8c435f0766e3162672eaefbef94cc
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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/7zip/7zip.pro
src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp
src/libs/installer/component.cpp
src/libs/installer/lib7z_facade.cpp
src/libs/installer/packagemanagercore.cpp
src/libs/installer/proxycredentialsdialog.h
src/sdk/translations/ja.ts
tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
tests/auto/installer/scriptengine/tst_scriptengine.cpp
tests/auto/installer/settings/tst_settings.cpp
Change-Id: I3bb98b8490b3c3eb7f664c1abb7417155b5430b2
|
| |
| |
| |
| |
| |
| | |
Change-Id: I8bad1c9bbe7b705ff0842f15fb0c9bc6c127e9bc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Spanish language was imported as name qtbase_es.qm. As it is not found
under Qt translations, all other translations were skipped to.
Change-Id: I093e72abf7385ca7926d61a14225e3254c1c1fbd
Task-number: QTIFW-791
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
|
|/
|
|
|
|
| |
Change-Id: I6cef758f1b9746b4eb03670765677bb8f5b275c5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Redefining QMAKE_MANIFEST is currently broken in Qt for newer compilers:
The content is not embedded at all if the toolchain supports "embedding".
But the hack is not needed anyway: Just disable the Qt manifest magic,
and include our custom manifest file via .rc. This way we can also avoid
changing the mkspec for embed_manifest_exe, embed_manifest_dll.
Change-Id: I5155ddabe17f0b61b2d7b9c5b9cd912ad6c53dfe
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I7c5dbe0a5610dc9b7671d6db3f57c169096c7ef2
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Iae06c6d5a9b1c678a4ab136da145a9c69ccadb6e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I311c5f0139e3fc54909b35d0629fecce58bcd37c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
|
|
|
|
|
|
|
| |
Translation files(qt_*.ts/qm) of Qt module has been split.(some of the language)
Change-Id: I41727bbec40d46c843cc70ab831dc41c650a2e1b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I30f36958759c920cabe38452176a856deeeefad2
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/libs/installer/packagemanagercore.cpp
src/sdk/installerbase.cpp
tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
Change-Id: I807686f154249930d31de80289389f4655c27525
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ifc5c2cc74dad576733b870cb135b45457de434ce
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Based on the former patches, split the installer base into its
own class. Use the new binary content read functions. Adjust uses
to match the new classes. Adjust installer base /update checker
signature and inheritance. Remove all now superfluous functions
from binary content. Core engine instantiates the operations now,
makes reading and writing more generic. Move product key check
into QInstaller namespace. Make use of the new command line parser.
Change-Id: I00aff79085b69ce627906881b43f374681ea7e91
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
No logic has been altered.
Change-Id: I1784cc50a454258435ae11d4d67d6951b5039e9f
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Remove some now superfluous methods from binary format.
Adjust initializing some objects as we need them not earlier.
Unify implementation of accessing the right binary to read the
content from.
UpdateChecker does now have its own run checker, makes it possible
to run the binary even if a e.g. maintenace tool is already running.
Change-Id: I94f32f7f38b62b5aee433753abc2fe72e879ddc9
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Remove: --runoperation, --undooperation, --update-installerbase
--dump-binary-data, Script, Updater, ManagePackages
Some of these options will go into a separate dev related tool.
Change-Id: I31084f60d3ed9a33abeb3df90fadf939d3b4c0a7
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I8e0793700196ea49e06a5c46731afd258f6443c3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ic9c88e27dca1e936ba09a3776df3df7ec166c606
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|/
|
|
|
| |
Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
installerfw.pri
Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add ts-<lang>, ts-all, commit-ts rules to src/sdk/sdk.pro
for translator's convenience.
Change-Id: Ie75641870e78b78f4db04ec9c7e4460b86d079c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|/
|
|
|
|
| |
Change-Id: I05eb763f0b8d8c97ceccc7bb2db2086c04ffa92b
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I1537facf4054a27359878d114b8c9278a2bdfe19
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|\
| |
| |
| | |
Change-Id: Ic8e6c13d020dbff3e1fb1ef156742aef81ba1b25
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I2d8b8f9b4ce5a1818955ee6c9ccd53a16f594187
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|/
|
|
|
|
|
| |
- it tries to copy the needed qt_menu.nib dir
Change-Id: I04fe564f62e16847a417e47c9a0719c043c1f027
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: I2e494d5f91d1cb740c6254544cf92daaae236f1a
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ic4e3f1c4099c4ff187eb4c81b66baf44da7b9e51
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|
|
|
|
| |
Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: I82672d7da43ce51703a02d2174617ce121c6fafa
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: I44cc8012f2ffa1a177582d674759b11785c88258
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|