summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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-081-1/+1
| | | | | | | | | | Change-Id: Iff1e5056a2465977fd6930f94a649ce51dd0fcd0 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Expose systemInfo APIKai Koehne2014-12-054-2/+260
| | | | | | | | | | | | | | | | | | 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>
* | Don't set modified state without real modificationNiels Weber2014-12-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setApplicationName and setApplicationVersion probably should not set the modified state to true as they are called way before actual installation is started. In case of real changes happening, modified will always be set to true by the other changes anyway. Without this change, an existing installation in the default installation directory of the new installer might be destroyed when aborting the new installer. This should probably be investigated further so that nothing is ever written before the real install is started. Task-number: QTIFW-583 Change-Id: I9921a33134133ae28433c4bfb726fe79ba93c20e Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Remove unneeded Kind enumjkobus2014-12-043-14/+5
| | | | | | | | | | | | | | The DirectChildernOnly value was not used at all. Change-Id: I9e6d4160f0964e807a34049b899bb4288b262b40 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Don't use volatile for thread synchronizationKai Koehne2014-12-031-1/+1
| | | | | | | | | | | | | | | | Use QAtomicInt instead, or just remove the attribute because it's only used in non-threaded code. Change-Id: Ieb762ab448ecc312a82478419dc0acd4ec9f82ae Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Remove unused code.jkobus2014-12-031-23/+6
| | | | | | | | | | | | | | | | Dead since commit 5359d0a3e8d84699701e73d3d15163fb20200bb0 Change-Id: I40af485876d70a6a68406eafe14258b185e16323 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Fix possible null pointer access.kh12014-12-031-2/+4
| | | | | | | | | | | | | | Task-number: QTIFW-593 Change-Id: I583cf4cb63abc9ecad9acf09b5573d380d852b30 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Enable setuid on Macjkobus2014-12-021-0/+1
| | | | | | | | | | | | | | | | | | | | Avoid a fatal error: "FATAL: The application binary appears to be running setuid, this is a security hole." Change-Id: Ie6281c7095fc8b6f2bbbf449005640c52e09f7a1 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Improve message, also fix spelling errorNiels Weber2014-12-021-4/+4
| | | | | | | | | | Change-Id: I9a1b66eb0df9fd480af6cb9bdcdde584eec2d14b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Remove occurrences of QHostAddress.kh2014-12-027-16/+5
| | | | | | | | | | | | | | | | | | The overload of QAbstractSocket::connectToHost() did convert to QHostAddress back to QString to call the other connect version. Change-Id: Idd4089fd92cfd9b103786395a455d0a18abc2c4a Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Refine server starting/stopping code.kh2014-12-022-20/+18
| | | | | | | | | | | | | | | | | | If we can't connect, the server is most likely not running. Also send an acknowledgment that we are going to shutdown. Change-Id: I1a06b0ea5b5bdeb736042ca8b49508b6a4fd90b8 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Move and rename connect method, adapt depending code.kh2014-12-025-65/+63
| | | | | | | | | | | | | | | | | | | | Move the connect into the remote object class and rename. Avoids passing around the socket and possible writing to the socket in a different thread. Also inherit the private remote client class from remote object to avoid code duplication (connect and send). Change-Id: I6e747dbbd8eff2846362d7f5fa4fa170495ac503 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Move the KeepAliveObject class into its own source files.kh2014-12-024-55/+158
| | | | | | | | | | | | Change-Id: Iaf8f397bdcaa4afb5432b826aa3fe238d54193c0 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Fix online installation into directory with elevated permissions.kh2014-12-015-40/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inside the Resource class we can't use QFile, as that will access the elevated running server to read from a only client side mapped file. Adjust Resource::readData to behave properly with the file engine's nativeRead(...) implementation, e.g. on Unix it returns -1 if called to read with a size of 0 bytes. Do not write to the socket if we are running in a different thread than the one the socket was created in. Fix logically broken connect function. Task-number: QTIFW-572 Change-Id: I993b5d3a5c217b0aedbbc27837dce2619e51d224 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Takayuki ORITO <iori.ayane@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Documentation updates and fixes.kh2014-12-0119-453/+522
| | | | | | | | | | | | Change-Id: Ie9fc9e1c2a0b84082cb48732e270913bc90d9a79 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Improve error message in deleteFileNowOrLaterKai Koehne2014-12-011-1/+1
| | | | | | | | | | | | Change-Id: Id5e3f8f0004d66ca1bea8bd644fd9010bd688847 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Clean up CreateDesktopEntry operationKai Koehne2014-12-011-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't delay the deletion of the file if we then try to replace it with the backup file/write to it. In addition, since we're on Unix, the deletion of the file can only fail if we don't have sufficient rights, and delaying the deletion until a 'reboot' doesn't fix this. Also, don't treat any errors in the undo step as errors that should show up in the UI: There are lots of reasons people might clean up their settings. Change-Id: I2e85f94e4fa427e0911ffab3a0111e4fb058ff1a Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Add ComponentChecker class for verifying the internal state.jkobus2014-12-016-1/+168
| | | | | | | | | | Change-Id: I3361ad6c51d5a0f3beee049237e6b370d57a8f0d Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | cleanup RollBackInstallationNiels Weber2014-12-011-11/+9
| | | | | | | | | | Change-Id: I8ad696bd4a4b0d2979172f66dad5153a78643b5e Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Fixed wrong fix in 19549b3b0f224db1bcf164139533473486d61b1cNiels Weber2014-12-011-3/+3
| | | | | | | | | | | | | | Some places needed scScript, not scScriptTag Change-Id: Ib18e3b1c2c446765120da5ebe117874bcd36e0a4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Fix ambiguity for scScript symbolsKai Koehne2014-11-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit 41e58eb4a481 introduced a new definition of QLatin1String scScript as "script", which clashes with the definition of scScript as "Script" in component.cpp. Resolve this ambiguity (which is not detected by the compiler) by renaming one instance to scScriptTag. Task-number: QTIFW-590 Change-Id: If1e108270509f7a1a0066d19e09a9f3699f0d19c Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Remove pointer, superfluous members. Use signals and slots.kh2014-11-284-25/+35
| | | | | | | | | | | | | | | | | | Use signals and slots to tell about the shutdown request. Instead of passing around the server pointer, give the port and key as parameter. Change-Id: I0ad1667aa1caee4ffdee8b6951336f2254974810 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Wrong assignment as truthNiels Weber2014-11-261-1/+1
| | | | | | | | | | Change-Id: I3d56249302114550ecf1ad020fe4ffd3af4141a2 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Implement a way to start the server in debug mode and API cleanup.kh2014-11-2613-106/+125
| | | | | | | | | | | | | | | | | | | | | | | | 1; Passing debug as first argument to the starting server does not start the server side so the server keeps running in an endless loop. This makes it far easier to attach a debugger. 2; API cleanup and unify init function to take port, key, and mode. The address was never able to be changed anyway, so stop passing them around. Change-Id: I2a847f009ed1557a5e136e2b0006de5c62426da2 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Implement server authentication and updating repository credentials.kh2014-11-269-71/+413
| | | | | | | | | | | | | | Task-number: QTIFW-570 Change-Id: I7b6b1fab8279331e5cb4b4da86726322b44a1109 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Fix typo.kh2014-11-262-3/+3
| | | | | | | | | | Change-Id: I6a0b2138dd3c4d085e1f1f3f4848910fbf43c2e3 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>