summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* no warning output if exception error is createdTim Jenssen2013-02-212-5/+5
| | | | | | | | 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>
* Autotest: Fix execution on macKai Koehne2013-02-211-0/+1
| | | | | | | | | | | Fix test failing with 'Qt internal error: qt_menu.nib could not be loaded.' on Mac OS X Change-Id: Ic10ee4b0e218611e27df786372752278e5e1e599 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Mark <Pages> element as deprecated.Kai Koehne2013-02-213-1/+7
| | | | | | | 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>
* Update Installer File sectionKai Koehne2013-02-211-6/+8
| | | | | | | Change-Id: Id765ac4aa5cb99470ded495605c33059e913a42f 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-204-30/+43
| | | | | | | | | | | 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-202-1/+10
| | | | | Change-Id: I087003da9da37be2379bf07f8494612167c8dba3 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Fix auto test for WinChristian Stenger2013-02-191-0/+6
| | | | | Change-Id: I412168bd4787c141d8d4680300df8a81ef75483a 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>
* Make the example compile with Qt5.kh12013-02-1810-21/+21
| | | | | | Change-Id: I765d38e8470ebed68d3a9e660bee7b4b9df304bb Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix compilation of tests on LinuxChristian Stenger2013-02-183-3/+0
| | | | | Change-Id: I97378bf02b077fd239effcaf155be41df61d6750 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Remove MaintenanceTitle from example as that has been removed.Niels Weber2013-02-181-1/+0
| | | | | Change-Id: I73ffd4ef07778639ce2a1a2241b92cc938481252 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Fix compilation of tests on LinuxKai Koehne2013-02-182-2/+0
| | | | | | Change-Id: If2277cb9dcacb1921eb7c01d14593dd5709feee6 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Niels Weber <niels.weber@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-144-8/+5
| | | | | | Change-Id: I1a1f3a22d7360f9a9e8036c76b721aa740e612e9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Don't hard-code version in documentationKai Koehne2013-02-146-4/+12
| | | | | Change-Id: Ib96057aa5103a80cbaacc27fe2330d481da70399 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Remove SigningCertificate from config.xmlKai Koehne2013-02-144-16/+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-137-12/+269
| | | | | | | | | 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>
* Add auto-test for QInstaller::SettingsKai Koehne2013-02-139-0/+147
| | | | | | Change-Id: I693f051636a81c395b3c75701a803ea7593a1fc1 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>
* Add missing config.xml elements to documentationKai Koehne2013-02-131-6/+27
| | | | | Change-Id: Ib7325cc951983a7b9f73af7ae9e5da57386361a1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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>
* Update docs. (Qt4, Qt5 support and digia naming).kh12013-02-1113-84/+147
| | | | | | | Change-Id: I08ab41846b7c954ee9ef1ae5c907a35864165e18 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Fix wrong layout in generated html output.kh12013-02-111-1/+1
| | | | | Change-Id: I8ee32b513d22faff479f23eeae9472d667882e75 Reviewed-by: Niels Weber <niels.weber@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>
* Documentation: Fix qdoc warningsKai Koehne2013-02-071-1/+1
| | | | | | | Fix warnings about "Unknown command '\win32'" etc Change-Id: I042fe95faaea1a90029a7d3831ad10200aeb85e2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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 some missing piece of information.kh12013-02-071-0/+3
| | | | | Change-Id: I5a43a2b8c278cb2e0b993ccbceb4d1741bb390bf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Documentation: Update screenshotsKai Koehne2013-02-0612-0/+0
| | | | | | Change-Id: I5940a917e6a197a7b7ebdfa2a649bd50b419f0d4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 15:47:26 +0000