summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused sv.tsKai Koehne2015-01-261-3384/+0
| | | | | | | It's almost empty, and we don't actually ship it. Change-Id: I276f127b52d86ecfd17470a96b2517c5154fb656 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix deadlock in elevated Settings operationKai Koehne2015-01-261-4/+4
| | | | | | | | | | | There are cases where using the RemoteFileEngine through QSettings will dead-lock. Avoid this by using QSettingsWrapper directly, like we already do in the rest of the code. Change-Id: I2e00e107c5ab471ddd6cd79fed96417bf4351c1e Task-number: QTIFW-618 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Fix updating of ts filesKai Koehne2015-01-261-5/+5
| | | | | Change-Id: I019b9f83e9fff2ce4ce9bc659ac6619b02d93956 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Fix a crash in testDynamicPage of scriptengine testjkobus2015-01-231-0/+1
| | | | | | Change-Id: I9fcb599c9b14162d0aa86aad0834737e28203939 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Use a UUID as uninstall registry subkeyChristoph Vogtländer2015-01-233-6/+11
| | | | | | | Change-Id: I365e3bdf529bed7bff526b772d9dec5260d71ba4 Task-Id: QTIFW-615 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: update the Controller Scripting topicLeena Miettinen2015-01-231-1/+1
| | | | | | | | | Fix some style and grammar issues. Add some subtitles and some information. Change-Id: Ibf2a3b4ff2a61782b45d772754859b35c7043192 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Add docs for QInstaller JavaScript objectLeena Miettinen2015-01-231-19/+38
| | | | | Change-Id: Ied88c365fdbd1cb7fe07d4ed196e7b568f6e892c Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Don't show checkbox for autodependent componentsjkobus2015-01-232-3/+7
| | | | | | Change-Id: Ia954f6337c188453f05b37725975be98a28d564f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: add docs for QFileDialog JavaScript objectLeena Miettinen2015-01-221-0/+32
| | | | | | | | Based on Qt reference docs for QFileDialog. Change-Id: Ic56fd5a48b290608f7810bc8f9260367389c5896 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Doc: add docs for the gui JavaScript objectLeena Miettinen2015-01-221-0/+12
| | | | | | | | Based on the example code in the Manual. Change-Id: I4b933fe49768fe296c89d715ea5aef30b6e3430b Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix running out of sockets in serverKai Koehne2015-01-211-1/+1
| | | | | | | | | | The client side (RemoteObject) sends a Destroy message to the socket when it's done. The server however did continue to listen to the socket even after the message, letting inactive socket descriptors pile up until we run out of them. Change-Id: I659ab8e24a81ab6163a05e2fb8db4dfd47ebd02f Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Doc: add docs for the console JavaScript objectLeena Miettinen2015-01-211-0/+19
| | | | | | | Change-Id: I0560178f9a1fbd60fa4a5f7c25706b2c826ecd14 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Show "Forced" component as enabled, but without checkboxjkobus2015-01-212-2/+2
| | | | | | | | | The indication that it will be installed will be shown in second column. Task-number: QTIFW-491 Change-Id: I23407fe9376a375e62a7b56a0284b12e42c83f81 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* no longer use Version as the repository format versionChristoph Vogtländer2015-01-204-9/+10
| | | | | | | | | | | | Use the Version value defined in config.xml as the product version exclusively instead of sometimes using it as the repository format version in components.xml (which must be 1.0.0) and sometimes as the product version. Change-Id: I63864947bf131ac6e246a2aaf6febdda0555c13d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Make sure widgets from .ui files are properly registered to engineKai Koehne2015-01-201-0/+1
| | | | | | | | | | | | | Make the QWidget representing a UI file known to the engine, so that e.g. child objects can be always accessed : component.userInterface("RegisterFileCheckBoxForm").RegisterFileCheckBox.checked; This worked reliably only if the .ui file has been shown to the user, which might not always been the case. Change-Id: I7a87773e29f6210ab7160d8e33c41f6ebeeb82d6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Include application size only in case of installer.jkobus2015-01-201-1/+1
| | | | | | | | | | | When createLocalRepository option was specified, include the size of application only for the very first installation (isInstaller()) and omit it in other cases. Change-Id: I3bb248cb1436c16e570140e8d70ebf5cba2c37e5 Reviewed-by: Christoph Vogtländer <c.vogtlaender@sigma-surface-science.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Delete components only after they have been removed from the listsKai Koehne2015-01-201-4/+6
| | | | | | | | | | | | | | This fixes a crash when a component destructor e.g. tries to unregister a widget: This might lead to the creation of a new scripting engine, which then tries to register all components into the engine, including components that have already been deleted ... Avoid this by first cleaning the lists, and then doing the actual deletion. Task-number: QTIFW-612 Change-Id: I708a1ade3b3cc15006eefe394c2d81bf47ebe754 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Introduce InstallAction property for componentjkobus2015-01-1910-42/+161
| | | | | | | | | | Fixes calculation of component size inside maintenance tool. Don't manipulate check state of components while calculating dependencies. Prepare feature: live preview of dependencies. Change-Id: I0485df8383bc9149a996456e09878fc5676bb27b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix a doc typojkobus2015-01-191-1/+1
| | | | | Change-Id: I4df5650d4a90dfa220b239e431f408bbff34e825 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix focus handling on the FinishedPagejkobus2015-01-162-41/+32
| | | | | | | | | | Simplify entering() / leaving() implementation for wizard pages, above methods are now called a bit later, when the new page is already visible. Calling setFocus() inside entering() should work properly right now. Change-Id: Ic5d194f074cc4b1fc419c7be70563e105e644957 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Warn whenever (auto)dependencies are not leaf nodes.jkobus2015-01-151-0/+24
| | | | | | | | | | | Whenever any source or destination node of dependency link or any destination node of autodependency link has children, warn about it. Maintenance tool isn't able to handle such cases properly. Change-Id: Ifaf3fbb7903eb960ab8fd977c4f47b7906900115 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* 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: 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>
* 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>
* rename CreateOfflineRepository to CreateLocalRepositoryChristoph Vogtländer2015-01-085-11/+11
| | | | | Change-Id: I36d7a504b27dfff8b9d10c9d90b6ff77108b9982 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Fix objects returned by gui methodsKai Koehne2015-01-085-41/+202
| | | | | | | | | | | | | 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-074-42/+52
| | | | | | | | | | | | 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>
* 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-113-2/+14
| | | | | | | | | | 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>
* 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-104-1/+55
| | | | | | | | 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>
* Add possibility to specify a control script.kh2014-12-108-29/+19
| | | | | | | | | | | | | 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-094-0/+19
| | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/1.6'Kai Koehne2014-12-082-6/+7
|\ | | | | | | Change-Id: Ic33f7938e8acf04d994bef0759885c207a9612a5
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 02:53:21 +0000