summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use example.com as example domain.Niels Weber2013-04-151-1/+1
| | | | | Change-Id: I68d481b9bd36a88decb25040d22bda5b9dfc1cc9 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Merge "Merge remote-tracking branch 'origin/1.3'"Tim Jenssen2013-04-114-4/+8
|\
| * Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-114-4/+8
| |\ | | | | | | | | | Change-Id: Iabd77388834a27ace28587ded37c66b4c9a9cbd3
| | * we need to continue if the operations is unknownTim Jenssen2013-04-111-2/+4
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ife281fabca69af58edae77fc4c413f336535f63c Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| | * show the error string not the empty errorStringTim Jenssen2013-04-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change autotest accordingly. Change-Id: Ia818cd822954f7022f965f0b504414db9fd56830 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| | * adding the OS attribute to be compatible with old sdksTim Jenssen2013-04-091-0/+2
| | | | | | | | | | | | | | | Change-Id: Ia9d9e3371008c77cfcdac04c6da40cd4b9a34fb6 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-04-094-5/+6
|\| | | | | | | Change-Id: I3936ddf1e70aabc3402769d38c8a79cd50fe9077
| * enable Qt4 patch syntax in QtPatchOperationTim Jenssen2013-04-091-1/+2
| | | | | | | | | | | | Change-Id: I006db8975e077d0f7391b7d273606299cc2fd19e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
| * Fix embedded file-to-patch listsIikka Eklund2013-04-092-2/+2
| | | | | | | | | | | | | | | | Do not patch .pri files for embedded targets. Change-Id: I52141d188f69b46203622b1e58782996529d1258 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * raise an error if the root element is wrongTim Jenssen2013-04-041-2/+2
| | | | | | | | | | Change-Id: I5f77ac85d6327697934cdc78d5354c6814adb6c8 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | create getrepositorycontent toolTim Jenssen2013-04-0912-548/+708
| | | | | | | | | | | | | | | | It is a very useful tool to get repositories locally for testing. Change-Id: Ia83841c3e5c96ab369c35580dd98141cf22ed643 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Move setPixmap to constructor, as requested.Niels Weber2013-04-081-18/+3
| | | | | | | | | | Change-Id: I99614ef80b9a97d8f84509be6ffa1558f35d8ab9 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge "Merge remote-tracking branch 'origin/1.3'"Tim Jenssen2013-04-0411-40/+92
|\ \
| * | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-0411-40/+92
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: installerfw.pri src/libs/installer/settings.cpp tests/auto/installer/settings/tst_settings.cpp Change-Id: Idb89f22fe940a730ed03a7d10f11e1b5fa655b49
| | * Add qt_menu.nib to ifw.appKai Koehne2013-03-281-0/+4
| | | | | | | | | | | | | | | Change-Id: I8d0de3413bf5df0b5b5ef5c839ab63ebd109c6f7 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| | * Bump versionKai Koehne2013-03-281-1/+1
| | | | | | | | | | | | | | | Change-Id: If4f563eb47e011309bd16b69d4a0adb8209f568a Reviewed-by: Niels Weber <niels.weber@digia.com>
| | * hide the StartMenuSelection page1.3.0Tim Jenssen2013-03-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | At the moment it would be only the readme file and the unsinstaller and that isn't worse enough. Change-Id: I1d48a0d6deb4e3e42a9f57c50b3cf791cd1edf86 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| | * Bump version to 1.3.0Niels Weber2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | Preparation for release. Change-Id: I953b959b23e80f99ec489db0707f74ee63d66d04 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| | * Cleanup.kh12013-03-261-7/+5
| | | | | | | | | | | | | | | Change-Id: I36406e3e32b04f7817ce049f9fa37910070688ce Reviewed-by: Niels Weber <niels.weber@digia.com>
| | * For some reason QString include is now required to compile.kh12013-03-263-1/+4
| | | | | | | | | | | | | | | Change-Id: I6717e985d1f3ba5559df3e250297373be9f9b7d5 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| | * Add strict and relaxed parsing to Settings class.kh12013-03-266-43/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * StrictParseMode -> creating binaries and repositories * RelaxedParseMode -> running the installer/updater itself Introduced parse modes to be able to use old settings (existing ones on user systems) with new binaries. Add and adjust autotest. Change-Id: I3f7c7357325661a1197400d8d8dc2a5ca8bed184 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| | * Add missing files into paths_file_lists.qrcIikka Eklund2013-03-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Embedded specific files were missing from the resource file thus not included in builds. Change-Id: Ib96a7036182399bed5f8a3f9d703cf4e1b850ccd Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | | Provide documentation for Vendorprefix parameter.Niels Weber2013-04-031-1/+3
|/ / | | | | | | | | | | | | Change-Id: I6a413c433ca302d731491f584497be7d5b31458f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Fix output of line number in logKai Koehne2013-04-021-2/+3
| | | | | | | | | | Change-Id: Id8a6e4820d3c83f6c8786289ab6dd8a83786ef02 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fix broken update behavior (size and description label).kh12013-03-281-22/+21
| | | | | | | | | | | | | | | | One could trigger an size label update for unchecked components cause the selection was still on a checked component. Change-Id: I953db1140a283aa92706129852f7ae56f62f1247 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Export private classes. We need it in some auto tests.kh12013-03-265-44/+81
| | | | | | | | | | | | Change-Id: I8014b4cfc1b3deff0b815dc8105b969d1a5d2947 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Throw if we can't load the requested UI file.kh12013-03-251-5/+13
| | | | | | | | | | | | Change-Id: Iced4d4649a386a18efabe80dc094461e7b1b1a74 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Cleanup.kh12013-03-252-172/+123
| | | | | | | | | | | | | | | | | | Iterate just once and remove all tags from existing xml. Throw and print error if we can't open an supported archive. Refactor duplicated copy code - license,translation,ui files. Change-Id: I60e215fdc5591ff9dcb5509db74448298ec6b752 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fully qualify function calls. Fix minor typos.kh12013-03-252-19/+23
| | | | | | | | | | Change-Id: I36cc096f3195e69bf027aa629d31ffac1d519732 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Change function names (to what they actually do) and signature.kh12013-03-254-28/+26
| | | | | | | | | | | | | | | | | | The signature change is kind of a cosmetic one, but I think it is more obvious that passing a reference into a function might modify the parameter. Change-Id: I424c06ed7a449204bd0b243ff07c2d36669b7381 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Assume offline installer if there are no repositories.kh12013-03-251-0/+3
| | | | | | | | | | | | | | | | Task-number: QTIFW-224 Change-Id: I90f6b5002fde182ed59d2c26f473e258e4bdbfad Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Pass the settings object to assemble.kh12013-03-251-15/+10
| | | | | | | | | | | | | | There's no need to parse the config file a second time. Change-Id: I7303b86a30f9ce17a8cfa419b70fc70b5948d151 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Rewrite copy configuration function.kh12013-03-251-72/+56
| | | | | | | | | | | | | | | | | | | | | | Fix broken function naming. Copy only files that are referenced inside the config file. Replace ":" as well, copy fails here on W8. Task-number: QTIFW-221 Change-Id: Ic039a8c54d4bb391fcd644c9da0dba7b20bda0f5 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Reuse existing make absolute.kh12013-03-253-13/+10
| | | | | | | | | | Change-Id: I9ad7287db0539e3fb6819220a3648244c10f1869 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Add banner pixmap to the wizard.Niels Weber2013-03-258-1/+30
| | | | | | | | | | Change-Id: Ic786efe56f0d74740cf23fc5f9b691f88df59d35 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Adjust to match coding guidelines.kh12013-03-251-9/+10
| | | | | | | | | | Change-Id: I1904dc6bd8706b7cf93d67cad497becbe480f1f2 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Remove unused/ duplicated function.kh12013-03-252-21/+0
| | | | | | | | | | Change-Id: Ic4412244ee9c5e7ff1d96a1d5d86924c7e1fcd1a Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Small cleanup, no functional change.kh12013-03-251-12/+7
| | | | | | | | | | Change-Id: I339d99d86ab71af785a9fa7b221d255d0e1f1f9b Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-223-5/+10
|\| | | | | | | Change-Id: I89a0518b54836afd97016061bcf000ccf7cdf62f
| * Compile fix when building tools staticNiels Weber2013-03-221-1/+1
| | | | | | | | | | Change-Id: Ie27962ae3fdf1b3ed06ba06ad81c1b169779ba65 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Allow setting of target dir in installer scriptKai Koehne2013-03-221-1/+7
| | | | | | | | | | | | | | Simplifies uploading of results on build machine. Change-Id: Ifcfb9f11f0b98754cca0368490b2a0267110111b Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * remove the unneeded second Settings objectTim Jenssen2013-03-221-3/+2
| | | | | | | | | | Change-Id: I60bc1dc23b33f11ab43613f5d02071523ce42b46 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | To be able to use 7z, we need to initialize archives.kh12013-03-221-1/+1
| | | | | | | | | | | | | | | | Broke that in 4cde7b2ed657e5cc2f5f7c071f4ff0a7dd20d56b Change-Id: I8a31417ffcf0ae9d8e35906d0bcccd479600d7cf Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Small cleanup.kh12013-03-211-16/+13
| | | | | | | | | | | | | | | | Use exit codes more consequent. Delete the meta dir even if an exception was thrown. Change-Id: I87354218091b562147fbc04c20181952fdc967ca Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-2119-198/+757
|\| | | | | | | Change-Id: Ibe38be81d8e763fb58899e2594641b8b062c5504
| * don't pollute output too muchTim Jenssen2013-03-211-2/+0
| | | | | | | | | | Change-Id: I554abf932ad6907155078cf132cdddda8414fe65 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * fix possible loop in moveDirectoryContents methodTim Jenssen2013-03-211-2/+5
| | | | | | | | | | | | | | | | If the user wants to move the content of a directory in a subdirectory, it shouldn't copy itself. Change-Id: I5d5d1b8bdb315b8122fb77ada779d46a63cd2277 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * fix crash in HttpDownloaderTim Jenssen2013-03-211-5/+8
| | | | | | | | | | | | | | | | | | If the download destination can not be opened it will shutdown everything. Which deletes the destination file object. Change-Id: Id16c71bf1157aa82984a9ad8462b1b8cc92bdd24 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * Fix missing wizard icon on a windows static build.kh12013-03-213-17/+31
| | | | | | | | | | | | | | | | | | | | Q_IMPORT_PLUGIN() macros are needed in application code only for Qt4, in Qt5 those are automatically generated by qmake. Change-Id: Ic75795be402592a0595bb3aa084d0b7ee9a9f8c5 Reviewed-by: Niels Weber <niels.weber@digia.com> 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-08 14:07:03 +0000