summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation with CONFIG+=force_debug_info (2nd attempt)Kai Koehne2015-01-151-1/+1
| | | | | | | Fix incorrect capitalization of option commit df99f9319e . Change-Id: Ifad4aadba0d8fddb0d629e7a883d4313a6e0f940 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix that the message of Qt module is not translated.Takayuki ORITO2015-01-132-4/+4
| | | | | | | 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>
* Fix space shown for already installed componentsNiels Weber2015-01-132-2/+2
| | | | | | | | | | After 71490cfe450165271a78e519d24ed39217bc440e the change in 8382a7e1ee11d7d408177c9d40a12474ff7fdef2 was wrong. Also update comment for requiredDiskSpace() that it only shows additional required space. Change-Id: I2bd12e9632a635b30d14c3655421790d21ea8b19 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Doc: add docs for buttons JavaScript objectLeena Miettinen2015-01-131-11/+26
| | | | | | | | | Based on Qt 5 QWizard documentation. Change-Id: Ic61ed428d1513fc21131992b1b40bf63a93b4fd2 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Fix links to the Qt BugtrackerLeena Miettinen2015-01-131-2/+2
| | | | | Change-Id: I88a6d8de17d7c1cf28f39b39fed8f4cea8618793 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Doc: remove "type" from briefs in Scripting APILeena Miettinen2015-01-134-5/+5
| | | | | | | | These are not QML types, but JavaScript objects. Change-Id: Ib50656c764270a1184c74a2c653438a2f42846fd Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix compilation with CONFIG+=force_debug_infoKai Koehne2015-01-131-0/+1
| | | | | Change-Id: I1759bfc043322a40e3c837b19e4e1bbcbdb4a47e Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix qmake warning about "Redunant entry in QTPLUGIN"Kai Koehne2015-01-131-1/+0
| | | | | | | | | | In qtbase commit 4255ba40ab073af (Qt 5.3.0 and newer) the plugins are added automatically, based on the Qt module one links against. Therefore just remove the QTPLUGIN line (similar to commit 807de07). Change-Id: I776627639fa30a289daafa38dd42835a6b7f53e1 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Doc: fix links after a page name changedLeena Miettinen2015-01-091-2/+2
| | | | | | | | These links were missed when Wizard Pages was changed to Controller Scripting. Change-Id: Iaeff9fe33bdc54b3248768312998a9adf0a2370d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: use the \c command consistenlyLeena Miettinen2015-01-091-15/+15
| | | | | Change-Id: Ida48b05643850e47130cba2e49f357eedbdf41fb Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: update docs for the Start Menu exampleLeena Miettinen2015-01-093-2/+35
| | | | | | | Change-Id: I861fb5fa80d7467a315c77b903d8de3b58724c54 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: update docs for the Quit Installer exampleLeena Miettinen2015-01-094-5/+43
| | | | | Change-Id: I0b456962e9a07e16a3e44882d936f604fcd4f71f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: update documentation for dynamicpage exampleLeena Miettinen2015-01-096-5/+78
| | | | | | | | | Fix issues in the example files. Use the same values in all config.xml files to be able to use a standard text to describe them. Change-Id: I3a6dae58270906f590cde0c6e234d9bbb75d34f7 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: rename "Scripting" topic "Scripting API"Leena Miettinen2015-01-094-5/+10
| | | | | | | | | To make it clearer what kind of information all the different scripting topics contain. Add a short description of the scripting API. Change-Id: Ie51714265356acaf92880bfddef85dedf8e1ad44 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: update docs for Modify Extract Installer exampleLeena Miettinen2015-01-084-6/+35
| | | | | | | | | | Fix issues in the example files and unify some values to make it possible to use standard text for the configuring section. Change-Id: I4e4236d519d075fc1f0461e3b863989ca0373cd3 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: update the Register File Extension exampleTim Jenssen2015-01-087-42/+103
| | | | | | | | | And the docs. Change-Id: I35f5edc1ad95df29d033e4220af003bac480d6e3 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: add docs for the Open Readme exampleLeena Miettinen2015-01-083-4/+50
| | | | | | Change-Id: I0abee03607ee82a7753e5b857392da31dfe54551 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* rename CreateOfflineRepository to CreateLocalRepositoryChristoph Vogtländer2015-01-088-14/+14
| | | | | Change-Id: I36d7a504b27dfff8b9d10c9d90b6ff77108b9982 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix objects returned by gui methodsKai Koehne2015-01-087-41/+214
| | | | | | | | | | | | | We need to make sure objects like pageWidgetByObjectName are augmented too (so that one can access child objects). This is achieved by a proxy object that augments all raw QObject * and QWidget * return values. This fixes e.g. the dynamicpage example. Task-number: QTIFW-605 Change-Id: If26dc59220946a7445ef0f9ec7caa15e5b04eaa8 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Simplify registration of objects into script engineKai Koehne2015-01-075-44/+54
| | | | | | | | | | | | Rename addQObjectChildren, removeQObjectChildren methods to addToGlobalObject, removeToGlobalObject, and merge the augmentation of the properties with newQObject. Also, don't recursively register all objects with their objectNames in the global scope. This avoids name pollution. Change-Id: I28f1bc67e6febecc7b5142982c918432b61ed96f Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Update German translationNiels Weber2015-01-071-1908/+1234
| | | | | | Change-Id: Iaacc3fdacd24e934187373eb899b681fc4057255 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: add the example topic to the browsing sequenceLeena Miettinen2015-01-073-2/+5
| | | | | | | | | Add \previouspage and \nextpage links to the topic itself and refer to it from the previous and next topic. Change-Id: If550e35f87c62a4a98512a2e9bd9aa4a6dd36374 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* sdk.pro was missing the ts file changeNiels Weber2015-01-061-1/+1
| | | | | Change-Id: I30f36958759c920cabe38452176a856deeeefad2 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Remove country from most translationsKai Koehne2015-01-069-8/+7
| | | | | | | | | | | | | | | If we provide an en_us translation only this won't be picked up by users having configured 'en', or 'en_uk'. This also mirrors the naming of the qt translations. The exception is zh_CN though, because the difference between simplified and traditional characters is big. I'm not sure whether taiwanese people would rather prefer traditional characters or english. For Qt we have both zh_CN and zh_TW, maybe we will get a zh_TW in the future too... Change-Id: I73490337aef8f54da14b6feca3a035e1e405d65b Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fixed wrong placeholder in string.Niels Weber2015-01-062-4/+4
| | | | | Change-Id: Ifeca6563c9b1c82ab754fe87e8cacfae040cc070 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update Japanese translation.Takayuki ORITO2015-01-061-4/+941
| | | | | | | Change-Id: If4481f5b23a44f3957610fdedafab92a52227e4f Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Takumi ASAKI <takumi.asaki@gmail.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Updated the method of assembling a message for a better translation.Takayuki ORITO2014-12-181-9/+10
| | | | | | | | Also added check to decide whether to add a space. Change-Id: Ibcd9b10ea093426eac53ddbd3cf8c8a190dcf294 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Optimize the loop gathering the parents of component setjkobus2014-12-151-21/+9
| | | | | Change-Id: Ia01398de4d92a8973460afb6d916f34694808bb0 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* tr() -> translate()Niels Weber2014-12-121-1/+1
| | | | | Change-Id: I805926a241d31f3ae6846a7429b99af4f68169fe Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add CreateOfflineRepository configuration optionChristoph Vogtländer2014-12-116-2/+22
| | | | | | | | | | Setting CreateOfflineRepository to "true" in config.xml will create a local offline repository, same functionality as "--create-offline-repository" command line option Change-Id: I51b947157ebc27800b1e9ad0b55d139ac6e164b2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Do not translate output of checkComponent.Niels Weber2014-12-111-28/+21
| | | | | | | We verify the output in an autotest. Change-Id: I378a407d40d430994164a0ecccb05ad11a5046f4 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update ChangelogNiels Weber2014-12-101-4/+6
| | | | | | Change-Id: Ibc3db06fc99fc05c82ba38b2d2482258c31fe8d1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* fix progress calculationChristoph Vogtländer2014-12-101-1/+1
| | | | | | | | | | use number of components stored in "names" and not the size of the string "name" to calculate progress. Task-number: QTIFW-602 Change-Id: If96a1233c9eef6600e995b29e30e7d8dcf5c477d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Expose findChild, findChildren methods to JSKai Koehne2014-12-106-3/+68
| | | | | | | | Re-add the findChild, findChildren methods known from Qt Script. Change-Id: I3db6be53ccd89a09b2c7de14ba7f96ebb26dbdbb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Doc: update the Tutorial sectionLeena Miettinen2014-12-1015-20/+39
| | | | | | | | | | | | Updated according to user feedback to make descriptions clearer. Added documentation for all sections in config.xml, explained HomeDir, and added a link to variable list. Deleted an obsolete note. Updated screenshots. Change-Id: I255569f8a09c7c3b996b6e201c5469874027cf60 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Add possibility to specify a control script.kh2014-12-1011-30/+25
| | | | | | | | | | | | | Right now we support control scripts just as command line argument, but now we can also bundle it in the binary as well. This helps e.g. with running scripts during uninstallation, enables the possibility to modify the introduction page or enables headless installer builds. Task-number: QTIFW-495 Task-number: QTIFW-166 Change-Id: I6fee6a55db78ed28b1eeb8257a4febaa2703c04e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update position of single quotation marks.Takayuki ORITO2014-12-101-1/+1
| | | | | | | It was equalized to a similar message that is included in the file 'kdlockfile_unix.cpp'. Change-Id: I00f3012efe1c4546e070342d1afd91cceaed42c3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* IntroductionPage: Fix typosKai Koehne2014-12-102-7/+7
| | | | | Change-Id: I51fb96ed8be188d37c549924118a87ceaf64f7e5 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Introduce a setting for Wizard default height / widthNiels Weber2014-12-097-0/+31
| | | | | | | | | | | | | Setting WizardDefaultWidth / WizardDefaultHeight in config.xml allows to set a default width / height for the wizard window. Minimal size will still be set by the size of the contents. Depending on style, watermark and banner image may override this setting. Default behaviour is unchanged. Task-number: QTIFW-47 Change-Id: I5695d501b2b31ea87ea63e95de454657cfebede6 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Don't remove "script" value from autoDependenciesJarek Kobus2014-12-091-7/+1
| | | | | Change-Id: I7f7c0df11f9a1a296d1514b7689daf317d9a45b7 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Remove unneeded member holding virtual childrenjkobus2014-12-092-5/+4
| | | | | | | | | Virtual children always lie after the non-virtual ones inside allChildren list anyway. Change-Id: Iefccabfc1d15f41a7e211b8fe4f518d1948013b1 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: enable linking to qtdocLeena Miettinen2014-12-092-4/+3
| | | | | | | | Replace a fixed link with a dynamic one. Change-Id: Ie0eec3aa67510b84d450057d7dbdbe2376be419b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Merge remote-tracking branch 'origin/1.6'Kai Koehne2014-12-082-6/+7
|\ | | | | | | Change-Id: Ic33f7938e8acf04d994bef0759885c207a9612a5
| * Fix corruption of uninstaller operations after 'soft restart'1.6Kai Koehne2014-12-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After updates have been installed, the user can restart the maintenance tool GUI, and check for updates again. If no updates are found then, availableComponents() will remain empty, letting fetchUpdaterPackages() nuke also all 'updaterComponentsDeps'. This in turn breaks sortOperationsBasedOnComponentDependencies(), which needs the list of components to calculate the order. Work around this by forcing a write of the uninstaller data before the core is re-initialized. This let the soft updater behave like an independent updater run ... if no updates are installed, the uninstaller is not written. Task-number: QTIFW-600 Change-Id: I83659491b8e2c0c7a0478362a6c3a4dfaec542b3 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
| * Fix broken start menu directory handling.kh2014-11-281-6/+2
| | | | | | | | | | | | | | | | | | | | | | While leaving the page, the value was updated in the core engine, but once the user returned back and choose a new one from the list it was set to the selected directory plus the updated one. Task-number: QTIFW-559 Change-Id: I907fd789bd4460b7479b4f17a06e3d31a8d22c20 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Allow spaces in path by defaultKai Koehne2014-12-083-2/+3
| | | | | | | | | | Change-Id: Iff1e5056a2465977fd6930f94a649ce51dd0fcd0 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Fix capitalisation in list headersNiels Weber2014-12-081-4/+4
| | | | | | | | | | | | Change-Id: I8a979af150322a93fae7282403ce7435acb69e6f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | add documentation for push buttonsChristoph Vogtländer2014-12-081-1/+23
| | | | | | | | | | | | | | | | add documentation for the push buttons available on the component selection page. Additional typo fix. Change-Id: Ibb862d6ebfca3ecbaac03ed95b4f78811d47c01c Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Add some example data for RunProgramNiels Weber2014-12-082-4/+5
| | | | | | | | | | | | Task-number: QTIFW-481 Change-Id: I00b863093697857bafcffa7e4a2afc4feee33365 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Expose systemInfo APIKai Koehne2014-12-0518-12/+579
| | | | | | | | | | | | | | | | | | Add systemInfo as a wrapper for QSystemInfo. Task-number: QTIFW-592 Change-Id: Ib54fcea8b0ef3a397a74f5315202f3000abd63cd Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 22:57:31 +0000