summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/1.3'"Tim Jenssen2013-04-112-3/+5
|\
| * Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-112-3/+5
| |\ | | | | | | | | | 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-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change autotest accordingly. Change-Id: Ia818cd822954f7022f965f0b504414db9fd56830 Reviewed-by: Tim Jenssen <tim.jenssen@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-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>
* | Move setPixmap to constructor, as requested.Niels Weber2013-04-081-18/+3
| | | | | | | | | | Change-Id: I99614ef80b9a97d8f84509be6ffa1558f35d8ab9 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-045-31/+61
|\| | | | | | | | | | | | | | | | | Conflicts: installerfw.pri src/libs/installer/settings.cpp tests/auto/installer/settings/tst_settings.cpp Change-Id: Idb89f22fe940a730ed03a7d10f11e1b5fa655b49
| * Add strict and relaxed parsing to Settings class.kh12013-03-264-41/+70
| | | | | | | | | | | | | | | | | | | | | | * 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>
* | 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-264-43/+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>
* | Add banner pixmap to the wizard.Niels Weber2013-03-255-1/+25
| | | | | | | | | | Change-Id: Ic786efe56f0d74740cf23fc5f9b691f88df59d35 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-221-3/+2
|\| | | | | | | Change-Id: I89a0518b54836afd97016061bcf000ccf7cdf62f
| * 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>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-218-188/+74
|\| | | | | | | 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-212-17/+29
| | | | | | | | | | | | | | | | | | | | 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>
* | 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-214-171/+39
| | | | | | | | | | Change-Id: I909c81896186ef5191d1dac799296da26e37072f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Deprecate Icon, introduce replacements.Niels Weber2013-03-213-6/+34
| | | | | | | | | | | | | | | | | | | | 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>
* | 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-183-9/+1
|\| | | | | | | Change-Id: I36a907cf2ee075eace35dcc42317f4202c1f5569
| * Remove LogoSmall as it never did anything anyway.Niels Weber2013-03-183-9/+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-1810-27/+134
| | | | | | | | | | | | | | | | | | | | | | 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-156-312/+313
| | | | | | | | | | | | | | | | | | | | 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>
* | Introduce QInstallerTools::copyWithException functionTim Jenssen2013-03-141-1/+1
| | | | | | | | | | | | | | | | | | Also use this new function and clean up some output lines related to this. Change-Id: I74e9385b449bbca79b70fbd214c5fa75b419ea29 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Compile after merge from 1.3kh12013-03-131-1/+6
| | | | | | | | | | Change-Id: I157cc7b00a2f4d3f436b9053cbcae1cbea11e615 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-132-3/+5
|\| | | | | | | Change-Id: I9baea78386e8b11faaf2ee3e26c8d87be8381a1e
| * Compile (Qt5).kh12013-03-121-1/+1
| | | | | | | | | | Change-Id: I67c4a5924d2b70a09a5ad1cd6f5537b6cdbd59da Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * 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>
* | Check for emtpy string before calling the windows function.kh12013-03-121-7/+6
| | | | | | | | | | | | Change-Id: Icbeab47fe4dff0411adeed310914761d117609ba Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-1212-5/+321
|\| | | | | | | Change-Id: I4059551829cd42ebde7706057d8f4cca57901037
| * added first version of a product key checker APITim Jenssen2013-03-1111-4/+315
| | | | | | | | | | | | | | | | | | | | 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-062-2/+12
| | | | | | | | | | | | | | 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>
* | rename to registerqtincreatorqnxoperationNiels Weber2013-03-124-6/+6
| | | | | | | | | | | | | | Old name registerqtvqnxoperation didn't make sense. Change-Id: Ic5d2d3061266cde7663b71c98cb23d0d8be8ece0 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 01:06:18 +0000