3145 Commits

Author SHA1 Message Date
Katja Marttila
905115833f Update german translation file
Task-number: QTIFW-1084
Change-Id: I023180400efd73655df004df417d9cf1ed86f23e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Niels Weber <niels.weber@qt.io>
2018-09-13 09:44:48 +00:00
Katja Marttila
6e6a20a5df Fix minor translation strings
Change-Id: I059903b407a44f07b16af29fb5f0973395ee1f50
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-13 07:57:27 +00:00
Katja Marttila
dd21b05b18 Add possibility to check/uncheck repositories with one button click
Task-number: QTIFW-1132
Change-Id: I4d71dedf6f099f8ccc7ecefcfa02cae78d28244b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-09-10 11:20:24 +00:00
Katja Marttila
6c38a975ee Add property to disable default repository saving
By default, all default repositories defined in <RemoteRepositories> are
saved to maintenancetool.ini -file. When you start maintenancetool, the
repositories are read from maintenancetool.ini and those are used. There
are cases when we don't want to use the default repositories when
running maintenancetol.

Change-Id: I4507e16636f2d709aa099eaa865264800591ce0d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-09-10 11:19:46 +00:00
Andy Shaw
8126ce3fe1 Prepend file:// on Windows when calling QJSEngine::evaluate()
Due to a bug reported at QTBUG-70425, it is necessary to ensure that
QJSEngine will see the filename passed in as a valid URL. So we
prepend file:// for those cases to ensure qsTr() will find the
right context when looking for translations.

Change-Id: Ib38b1f8467de78ec82c2c6c6909487f3a06c09bb
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2018-09-10 04:50:10 +00:00
Katja Marttila
81bc4da588 Fix admin query retry
Task-number: QTIFW-988 QTIFW-1173
Change-Id: Ie424f4dcb97236015d4287f1b73baee5ec8477b3
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-09-05 04:36:42 +00:00
scootergrisen
98e180cda5 Update danish (da) translation for Qt installer-framework
Change-Id: Ibc4dae55f01b42b636b2e09149f0f4caf6ede8e3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-07-12 22:51:20 +00:00
Katja Marttila
0cb205f7da Fix install fail if there is no metadata
Installer was never able to continue from metadata download phase in
case there was no metadata in any of the packages. If metadata not
found, emit finished signal to continue installation.

Task-number:  QTIFW-1150
Change-Id: I0d3f8fb147899fff4b1a1cc0c6de7a587aae9053
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-06-12 05:05:31 +00:00
Katja Marttila
f130512ec2 Reset meta information download result
As metadata can be downloaded in chunks, there are extra step counter in
UI in case there are more than 1 chunk to be fetched. Reset the counter
and result in case e.g. repositories are changed from settings and meta
information is retrieved again.

Task-number: QTIFW-1137
Change-Id: I1bfe06dc0ba375508efb0b6ebe5edce884310ea8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-06-12 04:57:42 +00:00
Katja Marttila
cf8d5b9a65 Merge remote-tracking branch 'origin/3.0' into master
Change-Id: Ia00c88061f15fc9c9517b536609ac3260c0df2ef
2018-06-06 10:50:59 +03:00
Katja Marttila
28316fbb7e Prepare 3.0.5 release
Change-Id: I1e2314b5cfb30bb5ccae214e28a894e9a1bea661
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-06-04 06:02:03 +00:00
Katja Marttila
83cc3b6b88 Allow install other components if sha mismatches in metadata
Expanding commit "Add attribute to mark parts of install tree unstable."
This change will allow installing other components if some component
has sha mismatch.

Change-Id: I61202da95dc07ca3f1fe931cfe1fbbb053596f42
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-06-04 03:14:49 +00:00
Katja Marttila
88d85a7894 Fix select state for unstable components
In updater mode, unstable components needs to be unselected so that
those won't be updated. In packagemanager mode, installed unstable
components needs to be in checked state so that those won't be
uninstalled.

Change-Id: Ib3d16ae8c0eec4e07731a0082c02fd710ffdb9d6
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-06-01 07:48:10 +00:00
Katja Marttila
85bff5f7b8 Decrease metadata dowload amount
If there are no Script, Translations, Licenses nor UserInterfaces
-tags in Updates.xml, there is no metadata. In such case, do not download
the empty metadata to decrease the time used in downloading metadata.

Task-number: QTIFW-975
Change-Id: I1b81a07b5ad43677e190fb058ece8b06382d215b
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-06-01 05:06:48 +00:00
Katja Marttila
d5be955bbb Print component warnings only in verbose mode
If there are lot of components, it takes a lot of time to check every
component for their errors. Print those only when --verbose given in
command line.

Task-number: QTIFW-975
Change-Id: If9467416d5d8f3417cd30262f95e91308a79e7a6
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-05-29 09:40:18 +00:00
Katja Marttila
f27a9e14d0 Fix ForcedInstallation components uninstall in deselectAll
We don't need to check the installed() state here as we do it already
when preselecting components in the tree

Task-number: QTIFW-1142
Change-Id: I3540a02f39ea7b379db6597c75d7fee76cc4caab
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-05-17 08:24:14 +00:00
Katja Marttila
e408037e22 Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I09cacedb966eebc3f42a3402b0b3dc4f6dcd9be8
2018-05-15 13:04:50 +03:00
Katja Marttila
1642cd883d Fix crash in updater if component does not exist anymore
Task-number: QTIFW-1140
Change-Id: I2038bb04526d6fbc3b35be67777a1096f80568cf
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-05-14 11:11:49 +00:00
Katja Marttila
82e2ad0d82 Fix nested autodependency uninstall
Previous commit worked only when --show-virtual-components was uses.

Task-number: QTIFW-1114 QTBUG-67106
Change-Id: I6d0649a37095b10ec9fd3a079e020f6a70345c94
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-05-03 06:41:57 +00:00
Andy Shaw
7b196800ed Add missing link from the documentation for hybrid installers
Change-Id: I05a3f5711cb963933470704bfec2ba8839384c0c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-04-20 11:00:56 +00:00
Katja Marttila
9dbdd261cd Fix nested autodependency uninstall
Task-number: QTIFW-1114 QTBUG-67106
Change-Id: I29cdddaa81657e5fd2b9cbf343e16cc107ce6c18
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-04-18 12:19:30 +00:00
Katja Marttila
a949acff47 Make unstable component text color darker
Change-Id: Id4734ea34b910e5abba6743a5e7d73e220e98aea
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-04-09 10:18:14 +00:00
Juha Karjalainen
7f8948f9e2 Add missing content for example dependencies
Added missing content for example --> making it possible to test it.

 Changes to be committed:
	new file:   examples/dependencies/packages/componentA/data/installcontentA.txt
	new file:   examples/dependencies/packages/componentB/data/installcontentB.txt
	new file:   examples/dependencies/packages/componentC/data/installcontentC.txt
	new file:   examples/dependencies/packages/componentD/data/installcontentD.txt
	new file:   examples/dependencies/packages/componentE/data/installcontentE.txt
	new file:   examples/dependencies/packages/componentF.subcomponent1.subsubcomponent1/data/installcontentF_1_1.txt
	new file:   examples/dependencies/packages/componentF.subcomponent1.subsubcomponent2/data/installcontentF_1_2.txt
	new file:   examples/dependencies/packages/componentF.subcomponent1/data/installcontentF_1.txt
	new file:   examples/dependencies/packages/componentF.subcomponent2.subsubcomponent1/data/installcontentF_2_1.txt
	new file:   examples/dependencies/packages/componentF.subcomponent2.subsubcomponent2/data/installcontentF_2_2.txt
	new file:   examples/dependencies/packages/componentF.subcomponent2/data/installcontentF_2.txt
	new file:   examples/dependencies/packages/componentF/data/installcontentF.txt
	new file:   examples/dependencies/packages/componentG/data/installcontentG.txt

Change-Id: I40fde219a5ab866f611e596dd5991b9b93c8856f
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2018-04-06 12:29:01 +00:00
Katja Marttila
d2ae9c16c3 Add attribute to mark parts of install tree unstable
This commit adds new AllowUnstableComponents configuration. Setting
AllowUnstablecomponents to true in config.xml will
* allow installing other components when there are errors in scripts
* allow installing other components when there are missing dependencies
* will mark the 'broken' components uninstallable in treeview

Task-number: QTIFW-930
Change-Id: I8d28cf9c4b0401e0bb76795e87d581f39b64f128
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-04-05 06:54:21 +00:00
Katja Marttila
3c4394c6de Fix build error in MacOS
MacOS does not understand ceil, use qCeil instead

Change-Id: I075aab60ae7e00336bdd4faf864c3922482401ac
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-04-05 04:35:41 +00:00
Katja Marttila
64a23f240f Fix install fail if there is huge amount of downloadable packages
In some machines, installer does not manage to download meta files if
there are huge amount of downloadable packages. It seems that
QtConcurrent is not always able to handle so many download tasks.
Divided the downloadable tasks into size of 1000 to keep the
QtConcurrent running.

Change-Id: I3ba110e2cc565251e540349a6b073245280a6fbe
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2018-04-03 06:57:06 +00:00
Katja Marttila
6664ca85f0 Add findFiles method
Task-number: QTIFW-1094
Change-Id: Ibc37e9b568f7f54e37f6ed6a5b040940cab5aebd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-03-26 08:46:30 +00:00
Katja Marttila
3f281b049c Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I601b783a9d2eed009737b2779803457949cbb014
2018-03-20 11:20:38 +02:00
Katja Marttila
6f28abfa58 Prepare 3.0.4 release
Change-Id: I2a7453e0a2a540a223dbdd5282f63413db5eb30e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
3.0.4
2018-03-19 07:57:01 +00:00
Katja Marttila
a63e8f2dca Fix infinite wait if downloadable package is missing
Instead of waiting for a package that is missing, show error message and
abort installation

Task-number: QTIFW-1064
Change-Id: I021e7ece9e4020a85380318185cdb6a424dc26fa
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-03-16 10:03:28 +00:00
Takayuki ORITO
b4d77f8ccb Fix the maintenancetool that failing to elevate to admin
It fails to output logs in ~PackageManagerCore() when using '--checkupdates'.
It is installed in 'C:\Program Files (x86)'(needs admin rights).

Disable the admin query.
Because it does not need the query for checking the updates.

Change-Id: I8cbd5823287a23d52c2f1a7f1fae95979314e441
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2018-03-14 06:05:53 +00:00
Takayuki ORITO
35af20a8ed Fix devtool's segmentation fault when using operation
change the name of the variable to parse the arguments of operation command.

Change-Id: I251b17e6e48b0a5c12636199de57bbb761b3ac23
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2018-03-13 11:03:07 +00:00
Takayuki ORITO
955253bde9 Update Japanese translation
Update message in ifw_ja.ts

Change-Id: I8a8495f57651eaa2a13a7b36206939f79fc96201
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-03-05 12:59:01 +00:00
Kai Koehne
96b7672318 Avoid including macro.qdocconf from Qt documentation
From Qt 5.11 onwards, macro.qdocconf requires QT_VERSION environment
variable to be defined. Just copy the two custom commands we use
in IFW.

Task-number: QTIFW-1103
Change-Id: Ib2d81e0f9e7b5518206efaf2a219ceb8109f6490
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-03-01 12:46:23 +00:00
Topi Reinio
486d4c68f3 Docs: Remove dependency to Qt's macros.qdocconf
The macros.qdocconf from Qt's global documentation config includes a
macro that uses the value of QT_VERSION, which is not defined for
IFW.

The documentation build therefore fails with
'error: Environment variable 'QT_VERSION' undefined'.

To work around this, load the macros we use from a local qdocconf
file.

Change-Id: I1dc02dffc758af8e855e42a0fceabb84434876d2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-02-28 12:41:36 +00:00
Oswald Buddenhagen
5ec8531696 move ts targets to a separate project file
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>
2018-02-28 10:17:59 +00:00
Katja Marttila
1ca9e90419 Merge remote-tracking branch 'origin/3.0' into master
Change-Id: Ic74ee1485204e09e2baa384468b581ba0d9c79cd
2018-02-26 13:21:09 +02:00
Katja Marttila
4f1e3f8e04 Remove unnecessary warning
Removed unnecessary warning about component specifying both
autodependency and dependency to same component. Both of them might be
necessary if we need to ensure the install order. Adding the same
component as dependency will ensure that the dependency component will
be installed first and its scripts run first.

Task-number: QTIFW-1022
Change-Id: Id400f1ecf00a4b863ee473218d61a549c6ceb9ca
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-02-26 11:19:16 +00:00
Katja Marttila
0a842140f5 Fix Mkdir operation in uninstall
If Mkdir generates directories to target dir, then uninstall will fail to
remove those as targetDir is replaced with @RELOCATABLE_PATH@ when the
operations are written to dat file. Fixed so that @RELOCATABLE_PATH@ is
replaced with targetDir.

Task-number: QTIFW-1099
Change-Id: I52a0330a2645e2d4a5371ce0d6f1fb296878752f
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-02-21 07:34:23 +00:00
Katja Marttila
c0b2007d20 Enable building IFW with Squish support
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>
2018-02-12 11:53:34 +00:00
Katja Marttila
fff2c98f4a Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I8d0c8b9faa9537b50e989ec264ed7bfe8d2e358b
2018-02-08 12:55:47 +02:00
Katja Marttila
0dd63d2e9a Fix release date
Change-Id: I89e68d3606d967332e7ccba8bf17a828bd0989e4
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
3.0.3
2018-01-31 07:23:14 +00:00
Katja Marttila
e6c28c7fe3 Prepare 3.0.3 release
Change-Id: I7f8be5eda5bf2ad1843b6b7243f254bbf3d55f84
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-01-30 07:04:54 +00:00
Katja Marttila
677f055115 Fix usesSystemConfiguration usage
As usesSystemConfiguration() is introduced in Qt 5.8, use it only when
compiling with Qt 5.8 or higher. IFW still supports version 5.6.2.

Change-Id: Ib39f38a452624a84627ad53c9941154bc0fd7929
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-01-30 07:04:43 +00:00
Katja Marttila
c0ac15295e Remove http_proxy environment usage
From Qt 4.8 onwards Qt automatically uses http_proxy environment
variable.

Change-Id: Ib7b3df96beeed14da86c1b17aa2402a9809f3983
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-01-25 10:56:34 +00:00
Katja Marttila
e3ddb89442 Set correct proxy type
From Qt 5.8 onwards system proxy might be used by default. Checked if that
is the case and updated settings accordingly.

Task-number: QTBUG-65143
Change-Id: Ibe8f3173636c57f73addcc576afdd37a68ec1d03
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-01-25 10:53:31 +00:00
Katja Marttila
17884d41ae Add no-proxy option
From Qt 5.8 onwards system proxy is used by default. Add option --no-proxy
to enable installer usage with no proxy.

Task-number: QTIFW-1085
Change-Id: If5247969aa9577cb746468c59802104d19826596
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-01-25 10:53:20 +00:00
Andy Shaw
9d00a5a957 Add line number information when throwing an Error regarding the script
Change-Id: I5bc3ca4779ed12d927c3a6a041a81d8e39d5bd1f
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2018-01-24 07:13:18 +00:00
Oswald Buddenhagen
5845091bd4 make .ts file naming follow the usual pattern
this makes it easier to integrate ifw into the surrounding
infrastructure.

Change-Id: I7918830b7a6c29d8556911eec83a3b6530478d84
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2018-01-03 17:39:31 +00:00
Riho Pihlak
0797935d29 Enable expanding items by default
An item can be expanded by default in component tree by setting
ExpandedByDefault to true in package.xml file.

Change-Id: Ib324327cf6ef6e2dda3271e704f3ced523c6579c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2018-01-03 07:51:26 +00:00