2652 Commits

Author SHA1 Message Date
kh1
32221180df Fix dubious warning about RequiresAdminRights tag.
The tag was added once component script is parsed and we did
know that addElevatedOperation is called from script. However,
the initial commit 7ccd0acdcf35b957e9e7d04cd81902bac362ad04 did
not append the node to the parent package update node. Now we
decided to have the option statically and declarative available,
so we can remove the warning.

Task-number: QTIFW-670
Change-Id: I8cd8f702391d7bf80fc4c42074e1fd6d2d4abc57
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-27 10:55:37 +00:00
Jarek Kobus
55eb4ba17e Don't modify check state of autodependent component when Select All
Change-Id: Id50fc5fa3460ffda62102019b46923b01b8e8745
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-24 13:00:07 +00:00
Jarek Kobus
c522fd5de9 Add more logging categories.
Change-Id: I1c7dabfd16a69ef5a3e5aaa490036de061f1fd13
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-24 12:58:49 +00:00
Jarek Kobus
2554ccb7ba Enable logging categories as an installer option.
Now by default all categories are disabled.
They get enabled only in verbose mode.
Verbose mode enables all categories by default.
Categories can be filtered using logging-rules option.

Change-Id: I9324826a6e2d7a746e3d7369747fcd31a42b84b6
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-24 12:57:10 +00:00
Jarek Kobus
61bf0345cd Add more explanations on warnings we issue.
Change-Id: I7fea8d8c5ebc1ffea78635c335a0740c648b8e2e
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-24 12:56:14 +00:00
Jarek Kobus
930cc36e49 Add a missing warning about auto dependency on component with children
Change-Id: Ib17fb2d48059ecc5b7f3b466661aad8e9d6b4b33
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-24 12:52:50 +00:00
Kai Koehne
f80d02863a Fix hang and errors when sending big packages over the socket
The assumption that packages of arbitrary size can be send is
apparently wrong on Windows. Also, one has sometimes to call
waitForBytesWritten, otherwise the data is never transferred.

Task-number: QTBUG-45625
Change-Id: I8b5a2584d4d42cf33d1d6688b0e17c44c325ac53
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-24 09:48:27 +00:00
Kai Koehne
82b427b777 RemoteObject: Do not use processEvents()
Replace the hand-written calls to processEvents() with
socket->waitForConnected(). It's unclear why this wasn't
done in the first place (maybe to keep the UI responsive
when the IFW was still single-threaded)? Anyhow, this
allows delivery of spurious events too, which can lead
to weird hang-ups.

Task-number: QTBUG-45625
Change-Id: I0ff2b85c05d0cc9d0102cf13791935be83c10536
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-24 09:48:06 +00:00
kh
cfc1f59676 Fix "Too many open files" error.
The current code did create all files in advance, exceeding the
open file limit on big downloads. Now we create the file once we
write to it.

Task-number: QTIFW-662
Change-Id: I9fe019e08342cbfb14bf564ad00b045cc03b6661
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-04-24 09:06:16 +00:00
Jarek Kobus
e2a30c0c18 Make componentChecker warnings optional.
To enable them export the following environment variable:
QT_LOGGING_RULES=ifw.componentChecker=true

Change-Id: Ied6744c745ca3fd0840c622c71a8ba30ad22e3d9
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-22 13:37:38 +00:00
Jarek Kobus
a8bd8bb5b3 Reset font property when setting "virtual" property to false.
Visible in systeminfo example, when run with --show-virtual-components

Change-Id: Ie9f82602d86c9be8060bc14ef5b1e524387f5c17
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-21 14:45:12 +00:00
Kai Koehne
57007dc93c Doc: Remove mentioning of "UpdateAgent"
It's the only place we mention an 'UpdateAgent' in the documentation/code.

Change-Id: I4e26246d7ecd7c9a81c006fb7448a9f788f7df20
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-17 09:53:01 +00:00
Kai Koehne
19d14ee1b6 Fix compilation with gcc 4.6
gcc 4.6 does not support alias templates yet.

Change-Id: I65f2dd8d8bf8ffae37ca2ed9743d24539cd47fcf
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-16 12:29:57 +00:00
Kai Koehne
6e9c785d3d Update ChangeLog
Change-Id: Ic5933f828cfee1cde0686a9fa888a397c9c63da0
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-16 10:13:22 +00:00
Kai Koehne
95ae661cba Windows: Fix crashes in elevated installation
Until Qt 5.5.0, QLocalSocket::waitForReadyRead() immediately returns
when there are still bytesAvailable(). This means our busy loop for
polling new data gets stuck.

To work around this we've been explicitly calling processEvents(),
which however can have undesired side effects: Namely that non-network
events get delivered too, and that 'intermediate' requests are sent
to the server, resulting in the protocol getting out of sync - requests
get replies from intermediate commands, ultimately leading to crashes.

The patch therefore removes the processEvents() call, and instead
works around the QLocalSocket::waitForReadyRead() deficiency by
subclassing.

Task-number: QTIFW-663
Task-number: QTIFW-656
Task-number: QTIFW-659
Change-Id: I4099fa1702cd8dceda954d672c9c3dac0ca7fd66
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-16 06:47:21 +00:00
Niels Weber
d50e3f94b5 Do not throw on empty translation files
Workaround for QTBUG-31031 (QTranslator::load returns false for
empty translation-files)

Change-Id: If4587b99c86a5afacada2d022af10460248ecf93
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-15 10:24:33 +00:00
Jarek Kobus
f3e8ccafa5 Move the component checker after installer calculator.
In this way we first check for errors, then check for warnings.

Change-Id: I3993498c9c517e7900d789fc0f04c59f9c150e14
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-15 08:09:52 +00:00
kh
4fff02a58b Document the operation storing mechanism more precisely.
Task-number: QTIFW-669
Change-Id: I7b4a89f74c0e82ec091876effaedf304de345fbd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-14 12:28:33 +00:00
Niels Weber
31b0637b4a Fix updatecheck
Check for installermarker was the wrong way around.

Change-Id: Id87cbc61d0bdb269eddc8377e5c775bc12c01174
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-14 08:07:16 +00:00
Leena Miettinen
c50057901b Doc: component.virtualStateChanged() signal
Docs were missing from the scripting API docs.

Change-Id: I941e387c4226fae2a4640605299d925b3101bf46
Task-number: QTIFW-655
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-13 15:23:20 +00:00
Leena Miettinen
2f8b412496 Doc: AdminTargetDir element is Linux only
In the configuration.xml file.

Task-number: QTIFW-658
Change-Id: Ia83649aac14be1d24bc1aa1cfee27da4d335e63e
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-13 15:23:13 +00:00
kh
c6c815e3d0 Compile with Qt 5.5
Change-Id: Iaab5bd3821bc4f1d4a826c9fee0c2a8c75d06bba
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-13 13:13:26 +00:00
Jonathan Courtois
cc2f6b45f2 Prevent disabled component to be selected using the Select All button.
The Select All button would select disabled component and try to install them, this new check prevent this.

Task-number: QTIFW-635
Change-Id: If15f765b2b8c2fcbb66f72f6d27e9b1d3db92e4a
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-04-10 13:18:57 +00:00
Jarek Kobus
893a36dd26 "Selected" property has gone.
Please see 5f6afc7d268dd16dd3f28d3579ae9517954a6553

Change-Id: I02a026c19d768b4d9c0c9f179d5738a121f46e99
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-10 11:31:35 +00:00
kh
b9d855d8cf Fix possible null pointer access.
Change-Id: I2cb1c8b70d41c764e0f9e47637b951c480ebcb5c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-04-10 10:14:59 +00:00
Kai Koehne
8d060e6910 Fix crash on exit for Windows XP, Vista
The destructor of QWinTaskBarButton until Qt 5.4.2 crashes on exit
if the OS is older than Windows 7.

Task-number: QTIFW-652
Change-Id: Icd0255f79f7339937f129cddce7291997d652f72
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-09 06:48:12 +00:00
Kai Koehne
62a65d9f88 Update contributor's list
Change-Id: I9964eb2caaccd0afe6d6000175d79d999c20bc31
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-08 12:21:31 +00:00
Kai Koehne
25ec075535 Bump version number
Change-Id: I78552ac9b88fd02828966e71ddafd25a3075535e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-08 12:07:42 +00:00
Kai Koehne
3aab9ef38e Improve Proxy Credentials dialog
Give it a title + hide the "What's this?" button.

Change-Id: I2717a0eeda5c2ca3da511d88540307763228b30b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-08 08:33:02 +00:00
Kai Koehne
a4c902f27a Mention compiler requirements
Change-Id: Iae3637ea149199f9b152efa4ea27a42bd4581974
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2.0.0
2015-04-02 08:52:18 +00:00
Kai Koehne
63ea335b99 Update system requirements
Change-Id: I316a737c8a3763baa3b35646e60a9a2d4b3468b3
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-04-02 08:52:13 +00:00
Niels Weber
d03e1def99 Change binary name to Qt Installer Framework
Change-Id: I9b721ae055ec9849492171dacf07c56ca7cc4b08
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-03-24 11:25:18 +00:00
Niels Weber
92b50c513b Exclude icu on Linux as well when building Qt.
Change-Id: I8327acb19e7141750caba882a7748bbf5d70a8ba
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-18 13:47:22 +00:00
kh
45b05a4a4a Remove references to QtScript print, use console.log instead.
Change-Id: If83b08f6a27ac9c07980dd83a56b1500f22b13ef
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-03-16 13:14:40 +00:00
Jarek Kobus
7c5724bb5f Inform about superfluous dependencies.
In case B depends on A and B auto depends on A,
the first dependency is superfluous.

Change-Id: I01a97e0777089fafd43d36b8f9675d7089099885
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-03-13 12:26:09 +00:00
Christoph Vogtländer
878109b5c4 Detail LineReplace documentation
Lines are trimmed before the search.

Change-Id: I1abbd0fa4abd105802c75ded80fcc82090e50e18
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-13 11:40:07 +00:00
Christoph Vogtländer
17e29fc8d3 fix empty installer.components array
Make sure the current list of components is used when referencing
installer.components in a controller script.

Change-Id: I9468110d61a958f13edba66da0059d6622aa7037
Task-number: QTIFW-601
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-03-13 10:16:51 +00:00
Niels Weber
0a49b33773 Don't show "safety" space on Ready for install page
This confused people as it is a different size than what is
shown on ComponentSelection page.

Change-Id: I3d20250f79b96312bceafb42277452bad7c15465
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-03-13 10:16:48 +00:00
Leena Miettinen
5f6afc7d26 Doc: update docs for component selection
The selected property seems to be gone, so QDoc now
wants isSelected() and isSelectedForInstallation()
documented.

Change-Id: I638f297a77ebd787a627374e71acab2026e49593
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-03-11 13:53:23 +00:00
Kai Koehne
2eb21e190b Update repogen documentation
Change-Id: I098b02f1fc0df4c3e2b09c5f97914be9c479d751
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-03-11 12:33:04 +00:00
Kai Koehne
4aacfb8e11 Fix embedding of installbase manifest
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>
2015-03-11 11:09:27 +00:00
Leena Miettinen
4b2727c742 Doc: add links to topics that describe the namespaces
In addition to linking to the classes from the top level
topic. The namespace topics are generated automatically
and list all classes in a namespace with brief descriptions.

Add subtitles for listing the classes in each namespace.

Change-Id: I0304a86717e018fa3af9f213871f159fdb4ce05c
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-03-11 10:52:38 +00:00
Leena Miettinen
462bbae2a5 Doc: move systeminfo scripting docs to a separate file
Reformat the docs in systeminfo.cpp as C++ code docs.
Edit for style.

Change-Id: Idec8aaae072a97f889b4d48051341ff766da4247
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-03-11 10:43:27 +00:00
Leena Miettinen
750c2b6a0d Doc: add archivegen usage to Reference > Tools
Change-Id: I4da08d1c34124ae9c2009c37121964a6b0dfaa66
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-03-11 10:16:36 +00:00
Jarek Kobus
8c2941ae58 Issue a warning when a component depends on auto dependent one.
Task-number: QTIFW-510
Change-Id: I57eff879deebf8f31a472a6c66a7e275e34447bd
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-03-11 09:53:38 +00:00
Niels Weber
dd2c70b10d Update Changelog
Change-Id: Iabe8537f039766baf415fd51d94f8e7941f29a92
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-03-11 07:20:04 +00:00
Niels Weber
6c796ce13c Correct usage info for archivegen
Change-Id: I51c5ba84320f4a31e1dce236157e53b57624f89d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-10 12:25:58 +00:00
Leena Miettinen
b6f3057680 Doc: move component scripting docs to a separate file
Reformat the docs in the C++ file as C++ documentation.
Fix language and style issues.

Change-Id: Ifc2ac0a99700d8b2a2ca6835927cdfb0abd7ed2e
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-09 12:31:43 +00:00
Leena Miettinen
b13d307acd Doc: add docs for print JavaScript object
Change-Id: I84d9987f3f6bfe6bf6788c89d4f5ab43c29655d5
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-03-09 10:19:59 +00:00
Niels Weber
ebb0925b81 Strip binaries before packaging
Change-Id: I4156f6aaff57eab95bc492da993709bee9db8e59
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-03-06 11:51:53 +00:00