summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Linux: Also find tmp dir on tmpfsNiels Weber2013-02-261-1/+1
| | | | | | | | | | | Fixes both tasks together with a852656506028cffa354f63ff8aa143376840534 Task-number: QTIFW-178 Task-number: QTIFW-198 Change-Id: I0c246e8a533728753b004a0cf8e1f86083779cd9 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* Fixes issue with wrong estimation of space on the mounted volumeMichal Klocek2013-02-261-1/+1
| | | | | | | | | | | * adds leading slash during reconstruction of path * part of fix for: Task-number: QTIFW-178 Task-number: QTIFW-198 Change-Id: Ib610442653074878c43630c1082f9fd6e45f71d2 Reviewed-by: Niels Weber <niels.weber@digia.com>
* cleanup operation run outputTim Jenssen2013-02-211-8/+20
| | | | | Change-Id: I24fefcabfe0d589a4e26930d355a593b22f2e3e2 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* no warning output if exception error is createdTim Jenssen2013-02-211-1/+1
| | | | | | | | handling that exception and showing a warning belongs to the higher level of the code. Change-Id: If529cfc5a010fa7043053ca97c33dfb554c519de Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Mark <Pages> element as deprecated.Kai Koehne2013-02-211-0/+1
| | | | | | | Change-Id: I4c3e4d3903d65d326dd35e16ccdee0c8d2dde31b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Make Virtual and Default tag mutually exclusive.Tim Jenssen2013-02-201-22/+29
| | | | | | | | | | | Call m_vars value function directly. 1; To prevent recursive calls in case of key "Default". 2; To avoid the extra function call to fetch values from m_vars in case of other values set in the object. Change-Id: I8f40b53704d1f314071d7060d0c92829310c262d Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Hide warnings in settings autotestKai Koehne2013-02-201-1/+1
| | | | | Change-Id: I087003da9da37be2379bf07f8494612167c8dba3 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Fix minor issues, we did calculate the parent index wrong.kh12013-02-191-7/+3
| | | | | Change-Id: I1ff08429e145846d75485625ab76ec6b5b39240b Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Export component model helper class.kh12013-02-151-1/+1
| | | | | | | | | The Component class provides propertys to access functions inside this class, so we need to export the model helper to be able to actually use them. Change-Id: I4456678cd8dda1c72a7f46afd9ce7a622127c104 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Sort root components as well.kh12013-02-152-0/+4
| | | | | | Change-Id: Idf792d9d7e27d400ef2d9a8f04210b61fe39f779 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix missing redraw while pages are hidden but still existent.kh12013-02-153-46/+19
| | | | | | | | | | | | | | | | Task-number: QTIFW-206 Fix issue when several pages are hidden, e.g. license and select components page, caused by the fact that we've overwriten the wrong virtual QWizard*::nextId() function. We need to implement the logic inside the wizards page nextId() function, as that one is called by the wizard anyway and by all pages that call either QWizardPage::nextId() or QWizard::nextId(). Change-Id: I377c007be618431d708cb2712a86d61d0d4e104d Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Update translations.Niels Weber2013-02-143-641/+1008
| | | | | | Change-Id: I88f74e120319d742730f7c9960039fb66f75e0bb Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Don't hard-code version in sourcesKai Koehne2013-02-142-6/+1
| | | | | | Change-Id: I1a1f3a22d7360f9a9e8036c76b721aa740e612e9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Remove SigningCertificate from config.xmlKai Koehne2013-02-142-12/+2
| | | | | | | | The files aren't used any more. Change-Id: I5b5becea08ebd56609241ab9db16f65b6e0fbf95 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Make loading of config.xml more strictKai Koehne2013-02-131-7/+40
| | | | | | | | | Explicitly check for unknown elements & attributes when loading config.xml. Change-Id: I31e6997b2f7d504e15dd24df2f4ae4005209168f Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Remove deprecated entry from desktopfile.Niels Weber2013-02-131-1/+0
| | | | | Change-Id: Ib6f344822cf4d9a762582fee800733acb3306ec3 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Unify some error strings.Niels Weber2013-02-1228-62/+67
| | | | | Change-Id: I3ce7d3f84c9654e5c457b9e5f6131ac931e8ba2f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Replace some leftover Nokia with QtProject.Niels Weber2013-02-124-8/+8
| | | | | | | Default config dir in Creator has been changed to that some time ago. Change-Id: I6acffeaa3d4e55d64e46e46debb4d767285f9af0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add the missing dotNiels Weber2013-02-111-1/+1
| | | | | Change-Id: Ia8316e8dfa4c5e5fa8e6f5890dde96b9343a7e12 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* allow providing a vendor to InstallIconsOperationNiels Weber2013-02-081-5/+22
| | | | | | | If given, it replaces the original vendor with the given one. Change-Id: I2a62ed9616c8f4a9bd2b39652d7f3fef1eb5dc7a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Small cleanupNiels Weber2013-02-083-3/+3
| | | | | Change-Id: I979f4f1542921da26b473d5f9ab9b1aadceafea7 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Typos, style and language improvements.Niels Weber2013-02-078-29/+31
| | | | | Change-Id: Ibc7d4ea8319b48b908adad75aa3a43858667cdde Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Improve and unify the error messages.Niels Weber2013-02-074-4/+8
| | | | | Change-Id: I13d3c17625b11a001816b17bc139ac273af53263 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Actually test for what the error messages states.Niels Weber2013-02-074-4/+4
| | | | | Change-Id: Ia341e273ca10116cae1f33278d5a3807fdefa5f2 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Remove as we do not use them anymore.kh12013-02-072-140/+0
| | | | | | Change-Id: I9ae2dfdd428e9c5da4ab2da6bad3f8d530d50502 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* fix line endings in license files on windowskh12013-02-071-1/+1
| | | | | | | | (cherry picked from commit cfd0d88a8b8bbc18d7f0969265cef9679d9f1d0b) Change-Id: I0d85071c2e6ffc24f3c0fc16d77c224570a27c88 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix patching of QT_INSTALL_LIBEXECSkh12013-02-071-1/+1
| | | | | | | | | | qt_lbexpath=%1/lib should be qt_lbexpath=%1/libexec (cherry-picked from commit e16a779736d32b48bc0134112645da7815070e4b) Change-Id: I1dbd9506f4687f00ff2dba97146a34985bb1e650 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QT_INSTALL_LIBEXECS need to be patchedkh12013-02-071-0/+4
| | | | | | | | | | | - added the QT_INSTALL_LIBEXECS (qt_lbexpath) as one of the to be patched values on qmake and other binaries (cherry-picked from commit 0120690e3e9bb610e35c9568565f6a4530a48d2a) Change-Id: I747a1842c676244276fc88f4e9cef46b017141ad Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Update files-to-patch-*kh12013-02-072-5/+5
| | | | | | | | | Library renaming caused changes in the file names (cherry-picked from commit f2870fa599329b9813f32653a55caa4a5154ce6f) Change-Id: I083861c5793cb778eb15b4872c620676b3f7e5a9 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Patch qdoc executablekh12013-02-073-1/+3
| | | | | | | | | | | qdoc executable needs to be patched by IFW Task-number: QTBUG-28529 (cherry picked from commit d74df62916d073439c8eafbc2630a19737f2565e) Change-Id: Iba9501d39c007cf4851ce5d8a4cacd5ffc6c776e Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* to be patched file list on Mac missed QtCore_debugkh12013-02-072-0/+2
| | | | | | | | | Task-number: QTBUG-28496 (cherry picked from commit 6803b4ea0a844c645e11531b0612d538dcf67d3d) Change-Id: I50cdb15671a6ecf67d7435c1fae4d362e27eed15 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add a hook to the calculateComponent methodkh12013-02-072-0/+2
| | | | | | | | | | - with we can add dynamic dependcies (cherry-picked from commit 845487b31c45db458759a49bda566c64aee5faaa) Change-Id: I4df7e976c548655635081efa1a08dc7e64e58a83 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Patch QT_INSTALL_ARCHDATA and QT_INSTALL_QML in qmakekh12013-02-071-0/+8
| | | | | | | | | | | | | QT_INSTALL_ARCHDATA and QT_INSTALL_QML added into qmake. Patch these as well. (cherry-picked from commit afa15f21cd25e722da9349ff0eba72b8ab1fe9b1) Change-Id: Id2fbde58d70c7525e51be22a7370f1fbcbe6cf59 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Update English translation.Niels Weber2013-02-071-668/+753
| | | | | | | | | (Linenumbers only) Change-Id: I098abad0e055a12b3bb0d175d9798455ec38d2d0 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add --binarydatafile argument to installerbase.kh12013-02-072-8/+28
| | | | | | | | | | | Task-number: QTIFW-214 Simplifies testing an already existing installer or maintenancetool using a newer installerbase or IFW build. Change-Id: I11df629614eb1c2c15ecc28af37d8e40b5173a79 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add ru translation.Ivan Komissarov2013-02-054-3/+3187
| | | | | | Change-Id: Ic4e3f1c4099c4ff187eb4c81b66baf44da7b9e51 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Typos fixed.Niels Weber2013-02-051-2/+2
| | | | | Change-Id: I20237d74b6aa206ca4c6cc52f0c484b8b14089f0 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Update German translation.Niels Weber2013-02-051-598/+857
| | | | | | Change-Id: If32fa7a1d3c75bc884d251c539ef44353f27f4fb Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add 2013 to the copyright.Niels Weber2013-02-05152-152/+152
| | | | | Change-Id: If64730ba7203d1a910a426c0d9c9a738ecfeff4b Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix typo.Niels Weber2013-02-041-1/+1
| | | | | Change-Id: I2ff380e23e08d67dc6cd7af4cb6d742d391b8896 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix broken define check and build on OSX.kh12013-02-041-3/+3
| | | | | Change-Id: I0adb567c85cbf6c1313254bbfca6db6ba89aaf89 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix mingw build...kh12013-02-041-0/+5
| | | | | Change-Id: Ie864b7ff47872f6097deb0b8b85d972fb383aa3c Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Make it compile.kh12013-02-041-3/+3
| | | | | Change-Id: I4c83ee4311e08f32442b417e9a6b96a7990c42f4 Reviewed-by: Niels Weber <niels.weber@digia.com>
* InstallerPage: Change text based on number of licensesKai Koehne2013-02-042-18/+43
| | | | | | | | | | Allow translations to adapt depending whether there's one or more license(s) shown. Change-Id: Ia8e816e63647f7ea682e026c4825911a77a56690 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* "Normalize" installation path on Windows installer.kh12013-02-043-7/+69
| | | | | | | | Task-number: QTIFW-175 Change-Id: I10ecc5830ff80f00a2aa67a2d9b66d9e37ac8ef0 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Check for minimum needed tags in config.xml (Name and Version).kh12013-02-011-0/+5
| | | | | | | Task-number: QTIFW-185 Change-Id: I354dd11978f513304b93e253c20baef77f8b1ba4 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix error string in GlobalSettingsOperation::setup.Ivan Komissarov2013-02-011-1/+1
| | | | | Change-Id: Iafddd2688cacbbe882173320113011096452ea15 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Prevent too long install path.kh12013-02-011-0/+10
| | | | | | | | | Task-number: QTIFW-201 Change-Id: Ie3c493149971ee3b00b3390ce7e301df4662650a Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Adds custom error message for executeoperationMichal Klocek2013-01-311-2/+15
| | | | | | Change-Id: Ib049bc9e91566eb8f53ea946e0fc62d3580c2957 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix "Retry" on uninstallationTim Jenssen2013-01-311-10/+8
| | | | | | | | | During uninstallation 'Retry' click the code checks the error value, however the error code of undo operation is nerver reset after retry. Check success return value of performOperationThreaded instead. Change-Id: Iee44d144fa1e9a3d1999ec3f46d35cab796935c6 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>