3128 Commits

Author SHA1 Message Date
Arttu Tarkiainen
6d5c3d36ea Fix incorrect compare string on findMagicCookieWithError() test function
Change-Id: Ic38a4dd321d01606deb5f85bfdabac3677205e81
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-08-15 12:14:34 +00:00
Arttu Tarkiainen
d4eb7fba67 Fix IFW version information not apparent on macOS
On macOS remove the use of obsolete CFBundleGetInfoString, replace with
CFBundleVersion and CFBundleShortVersionString respectively so that the
bundle's properties in Info.plist are up to date and version shows
correctly.

Task-number: QTIFW-1396
Change-Id: Iac03478e266d9d2994ecdf3b229e63976d683ac0
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-08-15 10:01:55 +00:00
Arttu Tarkiainen
1c22f5dd46 Doc: Define CreateShortcut operation as a Windows-specific feature
Task-number: QTIFW-1399
Change-Id: I81d5bf2c2abde9f0e49f5ea8cb99845e14159800
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-08-15 10:00:50 +00:00
Arttu Tarkiainen
55ecbb9660 Update repository categories on server authentication request
If repositories in a category were located on a server that requires
user authentication, IFW couldn't update information of the repositories
inside a category during runtime. This prevents for example storing
credentials from the authentication request dialog and blocks the
usage of that category.

Add a method for updating contents in repository categories and a
unit test for the new method. Also some minor tweaks to relevant
bits of code.

Task-number: QTIFW-1358
Change-Id: Idfa2559df6d0d2a6de428b8d5fb1f7672aa1e300
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-08-15 10:00:37 +00:00
Arttu Tarkiainen
120e527ed1 Fix recalculation of components to install in MaintenanceTool
In MaintenanceTool, navigating back and forth in "Update" and "Add or
remove components" doesn't cause update in components to install and
uninstall information. Without changing component model's state by
checking/unchecking components the recalculating is not done and
performing the opposite maintainer action causes unintended results.

Make IFW recalculate components to install when leaving component
selection page so InstallerCalculator and UninstallerCalculator's
state is correct even without changing the component selection.

Task-number: QTIFW-694
Change-Id: I89abd9a1952fe30d1e3ae4012e7a7bac68793a89
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-08-15 10:00:10 +00:00
Arttu Tarkiainen
1ae7ad5c68 Doc: Fix wrong values in Settings Operation summary
Task-number: QTIFW-1386
Change-Id: Ic8faf41fd972505353f6c2e461ddfb47a8db6d94
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-08-15 09:59:45 +00:00
Katja Marttila
18a722ade4 Doc: Update getting-started page
Task-number: QTIFW-1185
Change-Id: I602425589b3b2e0482d025a02b06f4b4c27ac330
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-13 10:48:51 +00:00
Katja Marttila
670e8b69f3 Prepare 3.1.2 release
Change-Id: I3e0c2cb9825974ec42940c55d8d9b48afa770d8e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
3.1.2-rc
2019-06-18 06:40:24 +00:00
Andy Shaw
b07d55203b Doc: Don't indicate that you can add pages in a control script
Change-Id: I6ddfc27334d8f14852cd926653b5ab56851c3fec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-06-17 12:58:02 +00:00
Arttu Tarkiainen
89f772f819 Gain admin rights for writing MaintenanceTool config files if needed
Running MaintenanceTool from an elevated directory didn't do proper
checks for file writing rights when parsing Updates.xml from a
repository, for example when a default repository contains actions
inside <RepositoryUpdate> tags the MaintenanceTool couldn't write
changes to the .ini file immediately.

Make MaintenanceTool do proper rights checking when parsing Updates.xml.
Create uniform methods for checking directory writing access as it is
used on several occasions. Add tests for directory checking methods.

Task-number: QTIFW-1363
Change-Id: I6d634ddbd59429e5b98af1d8010e70a71de40f69
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-06-14 08:10:26 +00:00
Katja Marttila
8d020f1b19 Update INSTALL file
Fix recommended configure options and building of Qt

Task-number: QTIFW-1185
Change-Id: Id4365b3debe8adbe325cba3ed868a7659438bdbe
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-06-13 10:28:15 +00:00
Katja Marttila
c1f87ceed0 Fix double condition check
Task-number: QTIFW-1082
Change-Id: I47e403444b2932984f0a559613826ca6fa9e41df
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-06-13 10:27:30 +00:00
Arttu Tarkiainen
0bb2d25e87 Fix initially deactivated buttons when selecting components to update
When entering component selection page for updates, force checking of
component model state change so we can enable or disable relevant
component selection buttons right when entering, not after first
selection change.

Task-number: QTIFW-1320
Change-Id: I86a94b70979f7064618186c539b0b7fc594d1481
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-06-11 08:04:49 +00:00
Arttu Tarkiainen
4ada7607ae Update documentation for Component Selection Page
Repository categories introduced in IFW 3.1 can cause behavior changes
in older automation scripts that use component selection methods.
Update documentation to include new items on Component Selection Page
and provide an example code for fetching components from a category.

Task-number: QTIFW-1354
Change-Id: Icf93d1325563d3bdf6a38799ab260b13f4078a81
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-06-03 07:01:54 +00:00
Arttu Tarkiainen
46aecc23b2 Fix MaintenanceTool file write permission check on Linux and macOS
Running the Qt installer on Linux and macOS with sudo will leave
the installation target directory and some installation files
writable by other users than their owner (root). Make
MaintenanceTool check over all subdirectories in the installation
directory for write permission so that admin rights can be always
requested when needed.

Task-number: QTIFW-1324
Change-Id: I9b314853634642b0be1fb3ea7a9164a2d4beb853
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-06-03 07:00:48 +00:00
Katja Marttila
c97eb6750c Documentation fixes
Change-Id: Ibfb4fd033f8dae23b953f21ebcda40c8325577e1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-05-27 09:15:47 +00:00
Arttu Tarkiainen
6ea22a1a9e Fix installer hang on Windows with empty command prompt window appearing
Installer sometimes hangs on Windows with a command prompt window opening
and blocking any progress. Hitting enter in this command prompt window
causes progress to move forward. This blocks automated execution of tests
since it requires manual interaction.

parentConsole boolean was not initialized properly, fix logically broken
closing actions for console.

Task-number: QTIFW-1250
Change-Id: I062c0491c16c26e9435022d79f99240bf59e1a79
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-05-17 10:52:33 +00:00
Katja Marttila
9653c8607f Update Russian translation
Change-Id: Ic8edbbd34b048d4d7b4fd034b0dddfa1e73ef8a1
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2019-05-17 08:43:13 +00:00
Kavindra Palaraja
6ec05851a7 Doc: Improve strings in the Select Components page
Task-number: QTIFW-1334
Change-Id: I4ed13fd066c98e1716f3358cffef85e160a3324a
Reviewed-by: Vladimir Minenko <vladimir.minenko@pelagicore.com>
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2019-05-13 20:40:31 +00:00
Katja Marttila
8730cb0fcf Update changelog
Change-Id: Ic4d755c27cf4f6f3d076a43444f21ce2d1ecc1cd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
3.1.1 3.1.1-rc
2019-05-08 07:46:17 +00:00
Arttu Tarkiainen
04a3e32784 Enable links and text selection in component description fields
External links can now be included in component description by specifying
a proper URL address like this: {external-link}='https://www.qt.io/'.
The link fields can be placed anywhere inside package <Description> tags.

Task-number: QTIFW-1292
Change-Id: I1d916a58224bdfb6e885445873bf541fad3cf834
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-05-07 08:38:04 +00:00
Andy Shaw
aba1d564ce Pass -sort-contexts when calling lconvert to keep the order for smaller diffs
Change-Id: I4634d54b9bbf0d762a7274ae482f480baed6c0d2
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-05-03 07:23:30 +00:00
Katja Marttila
e10545f37c Prepare 3.1.1 release
Change-Id: I4aae0b0a95cfdb94c608001b3d636cf2c535c4f6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-02 10:43:49 +00:00
Arttu Tarkiainen
a499b3d85e Add fetch to the same pane with package categories
Task-number: QTIFW-1284
Change-Id: Idfd81c3beb60a4dd3b6e8523c219823477eaeeb4
Reviewed-by: Janne Anttila <janne.anttila@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-05-02 10:05:39 +00:00
Arttu Tarkiainen
3e114f6317 Maintenance Tool: Change text in Select Components view when selection of components is not possible
Task-number: QTIFW-1241
Change-Id: Ib3e67e26b5fd4cf856c4b95f7fe542484e4955ff
Reviewed-by: Janne Anttila <janne.anttila@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-05-02 10:05:29 +00:00
Arttu Tarkiainen
9d8c368828 Fix long description texts not properly shown by enabling scrolling
Task-number: QTIFW-1308
Change-Id: I9b20d4a4c4e169bb6b523bbf53da6fb5053ae578
Reviewed-by: Janne Anttila <janne.anttila@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-05-02 10:05:16 +00:00
Katja Marttila
a35daeeee2 Fix install button string having a font name in French translation
Task-number: QTIFW-1333
Change-Id: Ia1b055aa0360885d6ab9b3c0aa0fc7930521e040
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-02 06:02:58 +00:00
Katja Marttila
d82a363286 Fix maintenancetool size
Task-number: QTIFW-1322
Change-Id: Ibab81f97f2a114b5b55d24deb0f013657e17fc39
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-23 10:34:27 +00:00
Sergey Belyashov
48fd5d74c8 Update Russian translation
Change-Id: I36d329b7c8742133fe62cfc250e53a71ac25d069
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: olesya gerasimenko <gammaray@basealt.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2019-04-17 18:02:47 +00:00
Frederik Schwarzer
cca4f41448 fix missing backslashed with double backslash command
Change-Id: I0404f3d08d2a4bdc3f5d3ccafe8a016486d4ecdb
Fixes: QTIFW-1037
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-04-02 08:52:27 +00:00
Katja Marttila
2b61b70718 Fix components shown in categories
If same repository was included in several different categories,
and the categories were fetched in the same time, the components
were shown only in one of the categories. Fixed so that once the
repository is downloaded, the related meta is included to all
categories. This also speeds up other category download times.

Task-id: QTIFW-1314
Change-Id: I0d890a52dee15a9bde11383f608f547a32b99ee7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
3.1.0 3.1.0-rc
2019-04-01 11:43:13 +00:00
Katja Marttila
701beccd14 Rename variables
We have named 'archive' to 'category' ages ago, rename the remaining
variables accordingly.

Change-Id: I3f723d3e7014c264e2a4db21c434708691a1038e
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-04-01 08:32:16 +00:00
Katja Marttila
2767210585 Fix update with long version numbers
Update fails if version number is longer than 32bit int. Fixed so that the
value is converted to 64bit int instead so the int overflow will not happen.

Change-Id: If7ab57e89b155793e9fab3ba5dad9c734adc2234
Fixes: QTIFW-1310
Reviewed-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-03-25 05:41:56 +00:00
Andy Shaw
407b19ff90 Update translations for a number of languages
The translations were contributed from an external and are for
Spanish, French, Italian, Japanese, Polish and Chinese.

Change-Id: I737c88e727c61fb358ab2cf99ce4b80a89817311
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-03-01 10:46:50 +00:00
Katja Marttila
2d6458cd9d Fix RepositoryUpdate functionality
After adding the categories, RepositoryUpdate got broken. This commit
fixes the issue

Task-number: QTIFW-1300
Change-Id: I01671a547712088d344852dc169661ac9587894e
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-02-20 13:05:09 +00:00
Katja Marttila
6f655ff640 Fix essential update
Essential components should be updated before any other component is
updated/installed. This did not happen always as when one essential
component was found and that did not have any updates, the search was
stopped and normal install flow was continued. Fixed so that all
essential components are checked if they contain update.

Task-number: QTIFW-1299
Change-Id: I754c50f672dd5f13105c710522603e90799d61c5
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-02-19 13:27:40 +00:00
Katja Marttila
f9fe3bc452 Change quantity information unit text
Task-number: QTIFW-1288
Change-Id: Ie5a6fdc27bb5eb96b080638839ee09f06370848e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-07 08:15:03 +00:00
Rainer Keller
d6768e5a16 Write desktop entry and items to the correct folders
Data should not be written to directories in XDG_DATA_DIRS.
The spec state that files should only be writen to the
directory in XDG_DATA_HOME.

Change-Id: I755963fa2f70d03c77d7beec0e3f87accde925d0
Fixes: QTIFW-1269
Reviewed-by: Nikos Chantziaras <realnc@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-02-04 13:11:50 +00:00
Katja Marttila
2a791f276d Add tooltip for categories
Change-Id: I852a236bc2cff0d532a825581e3da4dcdcbbab90
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-02-04 09:07:04 +00:00
Katja Marttila
f229bc4343 Minor changes to category naming
Change-Id: I7459535dd49047f9bf2d56a6598e9e631723444f
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-02-04 08:41:02 +00:00
Katja Marttila
086a3e43ad Reset error before every new metadata job
Installer crashed when invalid QBSP package was selected and after that
new categories were fetched. This was because the error message was not
cleared, although the metadata job was succesfull, installer thought
there was still problems causing it to eventually crash.

Task-number: QTIFW-1272
Change-Id: I8a5a6fd8568dcabd9c857c462b83d0e0b77669f8
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-01-28 06:46:37 +00:00
Katja Marttila
3d8c194690 Fix tmp file removal
Tmp files were not removed when all or these were met:
1. Using Linux
2. Installing to a folder which needs authorization
3. Installing a component which has no metadata
Tmp 'remoterepo-XXXXXX' is created before acquiring authorization.
In previous version if above list was met, a tmp folder was created
inside remoterepo-XXXXX after authorization leading to permission
error when deleting the folder.

Task-id: QTIFW-1268
Change-Id: I937fe3ce13440c817d1264c80ad060dfc966e456
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-01-22 11:34:59 +00:00
Katja Marttila
a7382f8f40 Fix build error in macOS
Change-Id: Ib1e3cb1cead8a856d74ef23808072a085e4d268d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-18 10:50:41 +00:00
Katja Marttila
9c50894327 Fix QWindowsPipeWriter error
Read/write operators were not in sync causing a write fail in
QWindowsPipeWriter.

Task-id: QTIFW-1254
Change-Id: I0c2ead9c6af9ea0459f7ed55b09540c50cc60a6c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-17 08:09:30 +00:00
Katja Marttila
7c3c796cbf Allow unstable components when categories are used
Unstable component means that the component has unresolved dependency,
script error etc. Installer cannot recover if we are already in
component selection view and fetch new packages from a category which
has unstable components if AllowUnstableComponent is false. Fixed so
that allowing unstable components is forced when categories are used.
Ideal solution would be to recover and rollback the install tree if
unstable components are found but that requires huge changes to IFW.

Task-id: QTIFW-1257
Change-Id: I786df1b8b54c238f50e15b94a06005e244417c97
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-17 08:07:58 +00:00
Katja Marttila
cd5168de39 Add possibility to preselect categories in config.xml
Change-Id: I280247cb5155622ade604074c5a71a276b0fb629
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-17 08:07:50 +00:00
Katja Marttila
4ca310dc29 Fix Next button state in component selection view
Task-number: QTIFW-1261
Change-Id: Ied506e68d430eef94d482ee2390aa5a8acc3b36e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-01-16 12:33:29 +00:00
Katja Marttila
2f55dced31 Organize categories alphabetically to ComponentSelectionPage
Task-number: QTIFW-1264
Change-Id: I14a54082c30107d9242632a69d73a637803c6f2d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-16 05:33:50 +00:00
Katja Marttila
2f30ae55a1 Add documentation for AllowUnstableComponents
Change-Id: I21943c007626c65c83a6766d6e470019187239a6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-01-15 12:38:19 +00:00
Katja Marttila
a810460e12 Revert RemoteFileEngineHandler removal
Seems this is used for gaining admin rights in Windows

Task-id: QTIFW-1254
Change-Id: Ia169200ead7a95d152378ba68ba9b8ad3054d5bb
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-01-15 06:51:07 +00:00