summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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>
| * Update files-to-patch filesIikka Eklund2013-03-215-162/+32
| | | | | | | | | | | | | | | | Updated existing Qt4 specific files and added embedded specific files. Change-Id: I0a23816ce8288b6c635d667bc51854299fba54a1 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Add script to build the ifw installerKai Koehne2013-03-191-0/+102
| | | | | | | | | | Change-Id: Ia8e02760ed4288557d51472891b5e9750d960366 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Add Installer Configuration for IFWKai Koehne2013-03-198-0/+572
| | | | | | | | | | Change-Id: I137abbe87e1fc2e4de83e509a17d5712b6c59f81 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Fix generation of documentation on windowsKai Koehne2013-03-181-10/+7
| | | | | | | | | | Change-Id: Ie7639a9c4dbf1fc972f5e5020042234de016b65f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Compile on MacNiels Weber2013-03-211-2/+3
| | | | | | | | | | Change-Id: Ib0aac416971bc3c73b0905d404f1c1620ddfa708 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | use humanReadableSize method from ifw libTim Jenssen2013-03-211-21/+4
| | | | | | | | | | Change-Id: I9c084e3dd57848852810dfbcce8245bf66646867 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Remove blacklist as it is no longer necessary.Niels Weber2013-03-211-8/+5
| | | | | | | | | | Change-Id: Ia6c003694b7297c30b019db3882375127ff04c03 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Remove previously deprecated Pages config.xml element.Niels Weber2013-03-217-298/+39
| | | | | | | | | | Change-Id: I909c81896186ef5191d1dac799296da26e37072f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Deprecate Icon, introduce replacements.Niels Weber2013-03-217-11/+65
| | | | | | | | | | | | | | | | | | | | InstallerApplicationIcon is used on Mac and Windows for a custom icon of the installer. InstallerWindowIcon is used to set the window icon of the installer on all platforms. Change-Id: I1f555441875b96e4d8e4ca9a808cf18b3a566c3c Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Fix build.kh12013-03-201-1/+1
| | | | | | | | | | Change-Id: Ic73add87271377b1dd31a661dc2d00c4c171bd1c Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Compile (Qt5 shared).kh12013-03-201-1/+1
| | | | | | | | | | Change-Id: I4a85275c6538a2b40cc51abf243af7a9cc3557af Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fix some small memory leaks.kh12013-03-202-4/+6
| | | | | | | | | | | | Change-Id: Ifb18ba7c3d83ac9cde7adf571625b13e876efd8e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Make deprecation warning less insane.Niels Weber2013-03-201-1/+1
| | | | | | | | | | | | | | | | "Multiple exclamation marks," he went on, shaking his head, "are a sure sign of a diseased mind." Change-Id: If8e39435db5962cea0bc2e5fa372389198f5d14f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-186-14/+1
|\| | | | | | | Change-Id: I36a907cf2ee075eace35dcc42317f4202c1f5569
| * Remove LogoSmall as it never did anything anyway.Niels Weber2013-03-186-14/+1
| | | | | | | | | | Change-Id: Ib3f2e2cdc44c06fe8f3c98ce3ddc7c72811eb8da Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | fix adding message to create Exception debug outputTim Jenssen2013-03-181-1/+1
| | | | | | | | | | | | Change-Id: I5214b6baef7ad7dc910492712f969f171fc4b9d4 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Added some lines to have a good breakpoint target.Tim Jenssen2013-03-181-1/+4
| | | | | | | | | | Change-Id: I1c528e899db6bc2959b8f94f45084662f27d4af1 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Use Q_GLOBAL_STATIC{_WITH_ARGS} following Qt coding conventions.kh12013-03-1811-28/+136
| | | | | | | | | | | | | | | | | | | | | | Move the regexp into its own compilation unit, so we get it only once and use a accessor to fetch the value. I guess we should do the same with the constants file, as all strings get compiled in the file including it. At least Ossi wasn't satisfied currently. Change-Id: Ic495a82f4b3cfe7810523b12cd3ef255eb15f149 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Add component model behavior auto test and fix broken model.kh12013-03-1511-312/+938
| | | | | | | | | | | | | | | | | | | | Task-number: QTIFW-84 Task-number: QTIFW-213 Change-Id: I8fc9035ba3b14c2c12a1672b74869bece68c8ee9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Rainer Keller <rainer.keller@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Replace child in place instead of deleting and appending.Niels Weber2013-03-141-2/+1
| | | | | | | | | | Change-Id: Idb8463d3728d2cdbaff59c7c27ec7d2044ea2bf0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>