summaryrefslogtreecommitdiffstats
path: root/src/libs
Commit message (Collapse)AuthorAgeFilesLines
* Rename and document functions to be more clear what they do.kh12013-05-062-18/+30
| | | | | | Change-Id: Ic31df64c4eff8aa19b58d4dcd26b7f99c9e90d3c Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix compile error.kh12013-05-061-0/+8
| | | | | | | Inconsistent operand constraints in an 'asm'... Change-Id: If68fec366d5a059c1d253f056348c76df8cd4d05 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add missing copyright header.kh12013-05-032-0/+80
| | | | | Change-Id: If8c39cd519ca1103b2643f262cea14dcc2866887 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix windows build.kh12013-05-021-2/+2
| | | | | Change-Id: I0473499e6c77f27076bc7ea35c2db965de2af04f Reviewed-by: Niels Weber <niels.weber@digia.com>
* Reset to only use the basic LZMA SDK (Unix).kh12013-05-02356-75844/+477
| | | | | Change-Id: Ic7607229197f74cdf88c46684b1413e00466185d Reviewed-by: Niels Weber <niels.weber@digia.com>
* Fix auto test build failure due to missing export.kh12013-04-301-1/+1
| | | | | Change-Id: I9299a66478b492862b892e4e3bb269fd96eab6bd Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Some minor Nokia -> Qt Project changesSergio Ahumada2013-04-302-3/+3
| | | | | | | | | - Updating the supported platforms link - changing com.nokia -> org.qt-project Change-Id: Ib74fda09f177a989b79288b967423ef04c16786e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* remove not needed debug outputTim Jenssen2013-04-301-1/+0
| | | | | | Change-Id: I44720577b7e13841506f8696c59686bdcabde099 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* describe why we shouldn't patch QT_INSTALL_CONFIGURATIONTim Jenssen2013-04-251-1/+4
| | | | | Change-Id: I30463b8aa612901c63f8087d6363df727cd35d7f Reviewed-by: Niels Weber <niels.weber@digia.com>
* reformat initialize list of classesTim Jenssen2013-04-2416-112/+114
| | | | | Change-Id: I4107c571497a98b962716bd7915c29fb50d70108 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Add documentation for JS APIKai Koehne2013-04-233-123/+898
| | | | | | Change-Id: Ifef70bf0ef12b90972186f64ff9b0ae602f14420 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* fix messageboxhandler with help of new autotestsTim Jenssen2013-04-231-58/+16
| | | | | | | | - fix setDefaultAction (use std::reverse directly) - fix missing Ok MessageBox value in script context Change-Id: I82fa5a06d83b6c8659c60a3e56a1d4bd91e70c14 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-235-69/+183
|\ | | | | | | | | | | | | Conflicts: src/libs/installer/lib7z_facade.h Change-Id: I045ca5e4a2a76e5e651bbedc613f086bd60d563d
| * fix error handling in 7z libTim Jenssen2013-04-194-66/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * Use proper English.Niels Weber2013-04-171-3/+3
| | | | | | | | | | Change-Id: I3f9c351c8bfd7d97b50cdb41a01ddd274ef44d41 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | added orderedButtons methodTim Jenssen2013-04-232-5/+16
| | | | | | | | | | | | | | | | - this is needed to write an unittest Change-Id: I2987c56360ac82f27e0bbfc0563feae297bb856b Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Set subTitle to " " if empty on Linux as well.Niels Weber2013-04-221-2/+0
| | | | | | | | | | | | Change-Id: I4449cd03c6e22ab924a3fa8f5e5185f0f940f373 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | 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>
* | 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>