summaryrefslogtreecommitdiffstats
path: root/src/sdk
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-231-2/+2
|\ | | | | | | | | | | | | Conflicts: src/libs/installer/lib7z_facade.h Change-Id: I045ca5e4a2a76e5e651bbedc613f086bd60d563d
| * fix error handling in 7z libTim Jenssen2013-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove an already existing symlink at extraction, because it uses QFile to get the io device and that would be the symlink target which was wrong. - try to get better 7z error output - an error would be now: "There was a problem while performing the operation: Error while extracting 'C:\Qt\qtcreator-2.7.0_test.7z': Cannot open file: D:/test/qtcreator-2.7.0_test/bin/sqldrivers/qsqlite4.dll (Access is denied.)" - move setPermissions to the end so read only files are getting the right timestamp Change-Id: I8881144660296618d443568e6974bf2721328991 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Check os-release instead of lsb-releaseNiels Weber2013-04-111-2/+2
| | | | | | | | | | | | | | Should be more standard. Change-Id: I531c19a2139bf1e1a2d307997e1ed01c33b50249 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-131-2/+4
|\| | | | | | | Change-Id: I9baea78386e8b11faaf2ee3e26c8d87be8381a1e
| * Fix crash on OSX.kh12013-03-121-2/+4
| | | | | | | | | | | | | | | | Since the message box is a Sheet, we do not need to update the page by calling repaint slot. It gets repainted once the Sheet vanishes. Change-Id: I69392847ef999e3d4b4a6fc1b7716085f50e7e8d Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-123-2/+17
|\| | | | | | | Change-Id: I4059551829cd42ebde7706057d8f4cca57901037
| * added first version of a product key checker APITim Jenssen2013-03-112-1/+11
| | | | | | | | | | | | | | | | | | | | This is more temporary solution to be able to use the 1.3 for new Qt releases. Change-Id: Ic28c75547da7d4d0c2efcca08cdbd76f4a0ad9f6 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Clean up Qt 5 build rulesKai Koehne2013-03-061-1/+6
| | | | | | | | | | | | | | Change-Id: I2e494d5f91d1cb740c6254544cf92daaae236f1a Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Make some constructors explicitNiels Weber2013-03-112-6/+6
| | | | | | | | | | | | | | | | As recommended by krazy run. Change-Id: If4acdf487e998d0c52b5443322cbde95b6e961fa Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-051-242/+254
|\| | | | | | | Change-Id: Ifb2048c4e820735ae8df05e2603b50fbeaf604d2
| * Update ru ts.Ivan Komissarov2013-03-041-242/+254
| | | | | | | | | | | | Change-Id: I203c927691b6d2b373a267270cf988dc0222dccd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Use using namespace QInstaller.kh12013-02-281-25/+27
|/ | | | | Change-Id: Id3a577446f73f35fa1b6f5472f549cea0d860665 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix missing redraw while pages are hidden but still existent.kh12013-02-152-44/+0
| | | | | | | | | | | | | | | | 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-141-1/+1
| | | | | | Change-Id: I1a1f3a22d7360f9a9e8036c76b721aa740e612e9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@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-053-2/+3186
| | | | | | Change-Id: Ic4e3f1c4099c4ff187eb4c81b66baf44da7b9e51 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Niels Weber <niels.weber@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-059-9/+9
| | | | | Change-Id: If64730ba7203d1a910a426c0d9c9a738ecfeff4b Reviewed-by: Karsten Heimrich <karsten.heimrich@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>
* Make IFW compile with mingw.kh12013-01-291-2/+4
| | | | | Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Check for non-ASCII characters earlier, we do related stuff there as well.kh12013-01-291-10/+11
| | | | | | Change-Id: I89fbd0d16c85636c9abc571dce77fb4e9c2c0add Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix translation fileKai Koehne2013-01-181-0/+1
| | | | | | | Fix translation file format that broke in fd8e2a3c6b76f164927f55 . Change-Id: Idc225e7261ad09372e936446d82bd6e6ca3871e5 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Translations: Remove translations mentioning Qt 5.0.0 Beta 1.Kai Koehne2013-01-182-5/+4
| | | | | | | The translations should be generic, not targeting a specific product. Change-Id: Id7cdbcf64c0db44458b2ca4606fd4cc4f291e3eb Reviewed-by: Niels Weber <niels.weber@digia.com>
* Change copyright headers from Nokia to DigiaSergio Ahumada2012-12-219-162/+243
| | | | | Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Finally IFW compiles with Qt5 (use private headers)kh12012-12-071-0/+6
| | | | | Change-Id: I2604c77418e4a930bd0f76092db581fef1e45817 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Adjust to compile with Qt5.kh12012-11-222-2/+9
| | | | | Change-Id: I82672d7da43ce51703a02d2174617ce121c6fafa Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Force to write our own manifest file into the binary.kh12012-11-213-11/+6
| | | | | Change-Id: I44cc8012f2ffa1a177582d674759b11785c88258 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix 207cfebb778b.kh12012-11-201-3/+6
| | | | | | | | | Obviously there was a problem with the indexOf call. Also once we omit the -i, the input could be -o or even worse the output path. Change-Id: I60a970c7e2857195e214cf2441d87468d297a7c2 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Follow advice given by Joerg, DEPENDPATH is now deprecated.kh12012-11-201-1/+0
| | | | | Change-Id: I8e08618bcc88cc445c317c79d93cdf9f1f2ca5e8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Some changes to start compile with Qt5.kh12012-11-206-15/+15
| | | | | Change-Id: Ie6a3ba7b3c0b24fc292d0d7444ae920dfa866a54 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Implement cmd option to dump binary content into given dir.kh12012-11-142-0/+36
| | | | | | | | | | Reuse already existing functionality, just fix the hard coded "repository" path name. Also check if we are running offline only, as otherwise there will be no data section. Change-Id: Iac45d89822fceee9e527afe0dc9eb589e39e16e7 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Check for valid drive. Disallow e.g. C:foo\barkh12012-11-141-5/+12
| | | | | | | | | | | | Task-number: QTIFW-165 Once we add a something after the colon and before the next slash, the path will be interpreted relative to the current directory, thus leading to unexpected installation directory. Change-Id: I0f32f150707d1b3ca55bd93f230142dad4f7540a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Move help switch further up, so it's allways available.kh12012-11-141-3/+5
| | | | | Change-Id: I3a8b2ae4b7445ba5ca6ab93f10e57e9fc1928a7b Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Add some more ambiguous chars and option to allow space.kh12012-11-091-3/+7
| | | | | | | | | | Task-number: QTIFW-148 Task-number: QTIFW-161 Change-Id: I20a0a1be872807305398d81b8672f3df77220212 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* remove app_bundle config only if it is a static build on MacTim Jenssen2012-11-091-2/+0
| | | | | Change-Id: Id26c7fed5ee155ab971b2a81aa9beb0589411c56 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix for German translation.Niels Weber2012-11-091-2/+2
| | | | | | | Fixes QTIFW-160. Change-Id: I16987612393554b896aff0d672bbbf7de7285306 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add setting to be able to hide the repository settings tab.kh12012-10-301-0/+6
| | | | | | Change-Id: I5ab5ac7352e06f0b89ec8e59e6cdfcc5b7be81da Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Revert 4ad2fe4d4a4 in favour of a more generic solution.kh12012-10-302-33/+35
| | | | | | | | | | | | | Task-number: QTIFW-156 Task-number: QTIFW-157 When we disable both package manager and updater radio button, we will never be able to add a valid repository anymore. Now use a more generic implementation and print an error message if we try to access the network without a valid repository. Change-Id: I27e4a7db96695b8ca32f391f910e455a553cc73e Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* "Update components" does not work (if no remote is defined)kh12012-10-181-11/+32
| | | | | | | | | | | Task-number: QTIFW-156 Disable the radio button in case there's no remote set. Notify the user about invalid/ disabled repos in case there are some.. Change-Id: I2a8ba9f3e40455ed0cb8e3d23744d7a3f0f6dd4f Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add missing manifest section to prevent PCA.kh12012-10-161-0/+10
| | | | | Change-Id: I28a78c9a9d2b73b21ba268fa13875a3be1f511ae Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fixed typos in German translationRobert Loehning2012-10-081-29/+29
| | | | | Change-Id: Ib5d967d60e76cec4bb346352cba71d83e1d7ecc3 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Store installer data in a separate file on Mac to support code signingPasi Matilainen2012-09-261-0/+8
| | | | | | | | | | | | | Code signing fails on Mac OS X if there's any extra data after the link edit segment in a binary, so store the installer data in a separate file inside the bundle. Task-number: QTIFW-153 Change-Id: Ie1edf21212b4a3bc5b6f32eea3f5d61e8800a0d5 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Revert "Fixes required for errorless MinGW-w64 compilation are done."kh12012-08-221-1/+1
| | | | | | | | This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it breaks compressing the meta folder (Windows 7, VS 2010). Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Add new commandline argument.kh12012-08-172-0/+5
| | | | | | | | | | | | In case we run an offline installer, --create-offline-repository will dump the whole installer content into the install directory and add an extra url to the repositories pointing to the mentioned local repository. This allows an offline user to add packages without the need of a new installation. Change-Id: I3e7eb0c56f632b74f5ea41b96bf3d9be83173f41 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* Fixes required for errorless MinGW-w64 compilation are done.tjenssen2012-08-101-1/+1
| | | | | | Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Make all Ubuntu versions use cleanlooks style.Niels Weber2012-08-031-5/+2
| | | | | | | | | | Doesn't make any sense to limit this to specific versions as the old ones go away anyway and all new ones exhibit this issue. Change-Id: I20fb4d13f2d1933c92fa09727f3d467d5210d24f Reviewed-by: Rainer Keller <rainer.keller@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* fix openpty static link problemTim Jenssen2012-06-121-1/+0
| | | | | | | | | - as the linker only adds symbols which are needed, the order of the libraries are important Change-Id: Iad8e5a5015cc5949be9b8f0b01702a7f854f6d95 Reviewed-by: Rainer Keller <rainer.keller@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* add the installer create datetime to --versionTim Jenssen2012-06-121-1/+12
| | | | | | | | | | - binarycreate patches the installerbase to add the installer create datetime - output is now: Installer creation time 2012-06-08 - 17:39:43 IFW Version: "1.0.0", Installer base SHA1: "7031ecf", Build date: "Jun 8 2012". Change-Id: I8f82c6942eefaf49e5ad8605577a0034a7502a6c Reviewed-by: Niels Weber <niels.2.weber@nokia.com>