4
0
mirror of https://github.com/QuasarApp/installer-framework.git synced 2025-05-12 21:09:35 +00:00

3004 Commits

Author SHA1 Message Date
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
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
Jani Heikkinen
917f355e66 Fix maintenance tool file name parsing in mac
Earlier we used QFileInfo::baseName but that doesn't work properly if
'.' are used in file names. So start using fileName instead.

Task-number: QTBUG-61262
Change-Id: I474b9656ef6d83dfbcdbc6ba6e40f95e75853c80
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-12-19 05:51:29 +00:00
Katja Marttila
4fd9839529 Fix custom pages documentation
Task-number: QTIFW-1061
Change-Id: Ib7e8317eb718ecb3e22b89bbef0414f48502992e
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2017-12-14 09:43:42 +00:00
Andy Shaw
bc50de22b2 Provide special handling of REG_EXPAND_SZ when setting environment variables
Since some registry settings with regard to the environment variables can
have the type set to REG_EXPAND_SZ then we need to ensure that this is
respected. Otherwise it will be changed to REG_SZ due to a limitation with
QSettings.

Task-number: QTIFW-794
Change-Id: Icaede82b151496367e531050082d416e19e15b56
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-12-12 10:37:06 +00:00
Ville Voutilainen
28399e39ce Avoid another null pointer dereference
Task-number: QTIFW-1064
Change-Id: I053071292ef8786f6d829b57e45091e881ce3d4d
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-12-12 09:26:58 +00:00
Ville Voutilainen
94190ee082 Do not retry a download immediately after an error
Change-Id: I1751b5274b3f2f6c69482d98c8beb2c1ef77ae70
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-12-12 08:06:33 +00:00
Ville Voutilainen
43d016bad2 Fix crash when httpReadyRead is signaled after shutdown
Task-number: QTIFW-1064
Change-Id: Id300f5838fb5f7e72a5e77415ac1832faa2d7c84
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-12-11 13:39:55 +00:00
Konstantin Podsvirov
977610bfb4 Add support dash (-) symbol in component name
Add colon (:) symbol as alternative separator beetwen
component name and version to use dash (-) symbol in
component name.

For names with dash (-) symbol use colon (:) symbol
as separator in dependencies between name and version,
even if you do not specify a version.

Requirement example: package-with-dash:>=1.2.3, stable:1.x,
demo:v1.0-rc1, backward-compatibility:.

Also add test 'tst_ComponentIdentifier' for check new feature.

Task-number: QTIFW-948
Change-Id: I6340c8001dec369ed8d33fcc4a92c7bce660aec1
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-12-05 07:26:41 +00:00
Katja Marttila
29e394792d Fix readFile documentation
readFile method returns string and not boolean. Fix it to documentation.

Change-Id: I8454b423a01e93c747087de662e6795a72db26bd
Reviewed-by: Karim Pinter <karim.pinter@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-12-04 11:33:57 +00:00
Andy Shaw
1d03b09622 Add documentation for the setValidatorForCustomPage() function
Change-Id: Id2c52f8a7fa2abbd1ac9de49d597269cb9bed220
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-11-30 15:19:37 +00:00
Katja Marttila
a97afeb7c7 Prepare 3.0.2 release
Change-Id: Ia09157cb1984de782ffd2817f07afbcd3998c3b1
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
3.0.2
2017-11-21 10:20:04 +00:00
Katja Marttila
e5860c5234 Add possibility to reopen admin query
In windows if admin rights are asked, you have two minutes to answer
to the query. After that installing is not possible as there is no way to
go back to admin query.
Adding a possibility to restart the admin right query when 'No' pressed
or two minutes timeframe has passed in Windows. Requires
DisableAuthorizationFallback set to true, otherwize user is asked to use
fallback '--startserver'.

Task-number: QTIFW-988
Change-Id: Ide33b588299c981cfe653e7f53e7316a768d87bb
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-11-14 09:27:04 +00:00
Konstantin Podsvirov
1f3eded578 Allow comparing non-numeric versions
Changes:
- Improve KDUpdater::compareVersion method;
- Add tst_CompareVersion test.

Task-number: QTIFW-948
Change-Id: If64f807cfb04e56d2bdd5fa250f456631df3f239
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-11-13 14:50:07 +00:00
Andy Shaw
8715fc14d9 Add clarifying documentation about QDesktopServices::openUrl
Change-Id: I2edca269b6f90511f4d41570a1ad08b7cc9d2f6a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Niels Weber <niels.weber@qt.io>
2017-11-13 08:24:42 +00:00
Katja Marttila
2539c3d453 Fix tests
Task-number: QTIFW-1027
Change-Id: I9d153924d0f88a537ddcf87e61cac2c550d6817f
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-11-08 08:40:39 +00:00
Ville Voutilainen
6f187699de Implement package download resume
This doesn't implement a resume for checksum files and
resource files; there's no pressing need for those.

Task-number: QTIFW-5
Change-Id: Id14a3d9b46f2e16a15f52ae536d060d505b2f4f0
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-11-03 07:44:14 +00:00
Konstantin Podsvirov
ee24c7aefc Add Component::addAutoDependOn method
Changes:
- Add addAutoDependOn method to Component class;
- Add method documentation;
- Improve tst_Solver test.

Change-Id: I5ed62368d62567f1056e20d89ba03c2639e0eaee
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-10-30 05:42:19 +00:00
Andy Shaw
d40c73e51c Use QDir::rmdir and not rmpath as that will remove more than it should
Change-Id: Ie38cc0f19817025c31124256ba968ecded61aef3
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-10-27 06:01:56 +00:00
Katja Marttila
0a11320bd0 Enable HighDPI support only in Windows
Enabling HighDPI looks crappy in Linux. In MacOS this flag is not
supported so enable it only in Windows host.

Change-Id: I15167e45371daab1176b0043802bdc8a6954d67d
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2017-10-26 05:43:34 +00:00
Katja Marttila
7238910303 Disable cross compiling
Change-Id: Ib0db7d9238f60e6a859bb8b5292d4166945c5495
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-10-23 09:21:49 +00:00
Katja Marttila
28ce815343 Do not reset core when pressing 'Restart'
Core does not need reset when selecting 'Restart'. If resetting,
settings dialog will lose some of its values etc. temporary
repositories set from command line.

Task-number: QTIFW-1017
Change-Id: Ifd67e373eaeccd85b985012b36b4314f59f0138f
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-10-16 10:04:18 +00:00
Andy Shaw
9775669476 Output correct invalid directory if it does not exist or is not a directory
Change-Id: I166f485b97403f5bdf1c37d4aa36da780b339b43
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-10-02 10:13:12 +00:00
Katja Marttila
741d16a9bd Merge remote-tracking branch 'origin/3.0'
Change-Id: Id2e682dc2698e08f91bee83e2a94de57403545a0
2017-09-25 09:03:06 +03:00
Jake Petroules
0089d7b3b7 Always build libinstaller as a static library
This fixes the build if IFW is built with a dynamically linked Qt, and
does not otherwise affect use of static builds of Qt.

Task-number: QTIFW-993
Change-Id: I1e6807e522adde339263c697fa4a1353250a2e3f
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-09-13 04:01:29 +00:00
Jake Petroules
21214c88dd Explicitly declare implicit dependency on QtQml in devtool
Change-Id: I4ef19a4733d5c469676f3b419c6f4adf1e6ff0de
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-09-13 04:01:15 +00:00
Michele Caini
aff147058e Update italian translation
Change-Id: Iadf3bd6ee397839f7121c2991069d262a271e849
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Massimo Callegari <massimocallegari@yahoo.it>
2017-09-13 03:55:55 +00:00
Jake Petroules
dee4f4f447 binarycreator: Write a proper LSMinimumSystemVersion value
This allows macOS to display a proper error message to the user if their
OS version is too old, as opposed to (probably) crashing and displaying
an error dialog with a stack trace.

Change-Id: I37570062d7358cc6304182182f095c9e51e16d06
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-08-30 04:36:57 +00:00
Sergey Belyashov
a1f568621a Update Russian translation
Change-Id: Iaa474ae2ed0c462b66ad3355e35e4c5a76d549fc
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
3.0.1
2017-08-23 10:23:31 +00:00
Katja Marttila
1fe36e54d5 Merge remote-tracking branch 'origin/3.0' into master
Conflicts:
	dist/config/config.xml
	dist/packages/org.qtproject.ifw.binaries/meta/package.xml
	dist/packages/org.qtproject.ifw/meta/package.xml
	installerfw.pri

Change-Id: Ib2ab53321b599eb2e8b1e6e23be2ba507a948c5c
2017-08-21 14:44:35 +03:00
Katja Marttila
776c09b330 Merge remote-tracking branch 'origin/2.0' into 3.0
Conflicts:
	src/libs/installer/downloadfiletask.cpp
	src/sdk/translations/ru.ts

Change-Id: Ibce8b9592c98cec5af3521f4ae6f850c2b8f45ac
2017-08-21 12:42:03 +03:00
Sergey Belyashov
854734dcbe Fix translation contexts in classes not derived from qobject
Change-Id: I0afbc19a27179b0646564cbb195683279175e98c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-08-21 07:03:50 +00:00
Sergey Belyashov
fd261ff6e5 Update Russian translation
Change-Id: I64a386e2c5c9f222c14384be002931746b60d3a4
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-08-14 13:17:40 +00:00
Jake Petroules
7a01e1b682 Fix syntax errors
Somehow a newline snuck into the wrong place, and ???? is recognized as
a trigraph, which produces a warning.

Change-Id: If948c544cba7ca880db4077bc3192332ce87ea52
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
2017-07-24 22:36:10 +00:00
Jake Petroules
116def3cb8 Write plists in the correct format, using v1.0 and with tabs
Change-Id: I496446d95b5523087e3d15ab3ad7cba697dea361
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2017-07-19 18:17:46 +00:00
Katja Marttila
947ca71af0 Prepare 3.0.1 release
Change-Id: I799de5aa50040aea159d9f13209e73d19ffed9d7
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-06-26 06:11:42 +00:00
Katja Marttila
d7ada4e0d8 Fix install type if --online-only passed to binarycreator
Binarycreator assumed that install type is offline if no repositories
was set although --online-only was set. However, repositories might
be set later, for example in producetkeycheck::init().

Change-Id: Idd6d0e3304974773baefe3773be7e2948704575c
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-06-22 11:47:44 +00:00
Katja Marttila
ad00a64d86 Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I36894f02abbb180bec7017fa48f2cbf07cee8cdc
2017-06-20 12:27:22 +03:00
Katja Marttila
a9544c7b6e Fix install fail if there are missing repositories
If any of the repositories was not found or had unparsable
Updates.xml, install failed although there was other valid
repositories. Fixed so that warning is printed when such repositories
found but continue install if there are other valid repositories.

Change-Id: I04fe8d91382a3ea97ce22cd64159a6a7d825128d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-06-20 04:32:15 +00:00
Katja Marttila
13dced124a Fix Component Name visibility in maintenancetool
Most likely the first QTreeView field which contains the Component Name is
the most valuable. Make sure that the name has enough space in QTreeView
to show the whole component name. This change prevents user to resize the
Component Name field

Change-Id: I5f7dc7158d2d6f9f6ed1b900eb8d312cd88c03ec
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-06-20 04:32:05 +00:00
Robert Obermeier
ee435ce922 Adminauthorization freeze fixed under unix
This should fix x11 authorization livelock problems
causing the installer to freeze after password entry.

There might be unrelated issues causeing further freezes.

Further explanation:
    If sudo does not terminate then closing stderr has no effect
    in remoteserver.cpp and the loop in adminauthorization_x11.cpp
    reading from pipedData will never terminate, causing the installer
    to freeze.

    It is important to close all references to stderr and terminate all
    applications that do not close stderr themselves in the fork/exec
    chain from adminauthorization_x11.cpp up to the remoteserver.

    Remoteserver will close stderr in remoteserver.cpp.

    Forking is done in main cause we can arrange it so that no threads
    are running up to this point. If any thread were running we would
    need to fork/exec in the child to be sure to restore a
    semi-deterministic state.

Task-number: QTIFW-934
Change-Id: I87374d3ff195b42da0248c83aff020d373306d93
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-06-15 05:03:54 +00:00
Katja Marttila
67d1751470 Fix 'Failure to fetch repositories' if repo missing in Qt5.9
Change-Id: I0bb66c412bd60a6ec1a9a3dd30059928b43f3c0a
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2017-06-13 11:47:07 +00:00
Katja Marttila
1298f46651 Enable high-DPI scaling
Task-number: QTBUG-61122
Change-Id: I412af85f4dd6f379aa09de10d09726e3d2c130e1
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2017-06-08 09:10:17 +00:00