summaryrefslogtreecommitdiffstats
path: root/src/libs/installer
Commit message (Collapse)AuthorAgeFilesLines
* Fix some typos in includeguardsNiels Weber2013-03-124-12/+12
| | | | | | | As recommended by krazy. Change-Id: Ia9e649bfba9a5ceb22af9459b1b7b277b1cc0ce7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Replace getenv with qgetenvNiels Weber2013-03-121-2/+3
| | | | | Change-Id: Id21e529d0c1b94ff1dc6b90b60000da14189d0ab Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Compile.kh12013-03-111-1/+1
| | | | | Change-Id: Idca34a8ee0561c737aa6e305e748e062ce17b6fa Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix various minor issues reported by krazy.Niels Weber2013-03-113-4/+4
| | | | | Change-Id: Icf975d0cc546ddc69e35b42a0d4d546e05bfe795 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Replace TRUE and FALSE with true and falseNiels Weber2013-03-113-4/+4
| | | | | Change-Id: I2b29fc799523c0bb57dd2c0fe31ab23a7bc890be Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Make some constructors explicitNiels Weber2013-03-115-5/+5
| | | | | | | | As recommended by krazy run. Change-Id: If4acdf487e998d0c52b5443322cbde95b6e961fa Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Make CreateShortcut operation a NOOP on non-Windows systemsNiels Weber2013-03-111-2/+8
| | | | | | | Task-number: QTIFW-226 Change-Id: I49bd46c0281401197b6cbe8806d3106a70e1760f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-051-0/+6
|\ | | | | | | Change-Id: Ifb2048c4e820735ae8df05e2603b50fbeaf604d2
| * filter sha1 files in createArchive script callTim Jenssen2013-03-051-0/+6
| | | | | | | | | | Change-Id: Ibc91cfae6d860d69b95f33a9fe12c0518e522792 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Fix test case for RunProgramArgumentsAurindam Jana2013-03-041-1/+1
| | | | | | | | | | | | Change-Id: I54c3ed656a2e00e45779f67a07130f71684fc457 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Add RunProgramArgumentsAurindam Jana2013-03-046-3/+13
| | | | | | | | | | | | | | | | | | | | | | The common case that the called application needs arguments wasn't implemented. Change-Id: I60b2d149399b4036c4fc30b55b0d17997993d8bd 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> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Get rid of some superfluous includes.kh12013-03-0410-37/+20
| | | | | | | | | | | | Change-Id: Id2d6252d8e7be5bcd2bcf82962d293e8de7e2563 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-02-284-68/+52
|\| | | | | | | Change-Id: Ib88eb76f360819fbdf2fd52b19fde6d5f5650447
| * Fix wrong check for running application.kh12013-02-282-56/+28
| | | | | | | | | | | | | | | | | | | | Add auto test. Reuse already existing code in package manager core. Change-Id: I4346333882e37c8edba9a2eb85a9cdd56ae5917e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Add repository class auto test and fix missing operator export.kh12013-02-271-4/+4
| | | | | | | | | | Change-Id: Ie7b490fa66c20ddd59788f00a75e363d7bb80697 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * cleanup operation run outputTim Jenssen2013-02-211-8/+20
| | | | | | | | | | Change-Id: I24fefcabfe0d589a4e26930d355a593b22f2e3e2 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-02-213-23/+31
|\| | | | | | | Change-Id: Ia37c543d1199ad4ddc37ff6b14c2806c03a8009f
| * 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>
* | Compile fix.kh12013-02-201-1/+1
| | | | | | | | | | Change-Id: Iea2237923ec0fae9d3b3df02b70abb4a0f2d79cb Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Fix boolean parameter which lead to less readable code.kh12013-02-205-19/+26
| | | | | | | | | | Change-Id: Ie680654f39fce130c607929f98db372dbe3c6ea1 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove RunMode enum, it's useless and clutters the API.kh12013-02-199-49/+36
|/ | | | | | Change-Id: I4323a0d66bda362ccee71a19352c37c9ac1b51e1 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@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-151-2/+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>
* Don't hard-code version in sourcesKai Koehne2013-02-141-5/+0
| | | | | | 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>
* Typos fixed.Niels Weber2013-02-051-2/+2
| | | | | Change-Id: I20237d74b6aa206ca4c6cc52f0c484b8b14089f0 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>