summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* treat strings containing commata as QStringListsAlexander Lenhardt2011-12-161-1/+4
| | | | | Change-Id: I6d8980a5825209b23539b4cd2fd6cf148e26d8ea Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* fixed compile errorsAlexander Lenhardt2011-12-151-2/+2
| | | | | Change-Id: I6ed35d9933fa7b3bcf621267710c155ccc569706 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* improve parse arguments at operationrunnerTim Jenssen2011-12-152-8/+12
| | | | | | | - and don't pollute args with this cleanlooks hack Change-Id: I6cacd33b5c02effe267fabc745b1e8f1aab77166 Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
* fix the hack that uses cleanlooks under Ubuntu 11.10Tim Jenssen2011-12-131-5/+6
| | | | | | | | - count wasn't the right position in the array - and don't ignore style from commandline Change-Id: I8bc5f169c51adafeb333b0872bb5adbde59d01e7 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* try to hack around the ubuntu 11.10 problemTim Jenssen2011-12-121-0/+28
| | | | | | | Change-Id: I3e36c2816513e079f57b168c044f8b2d3355164d Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* show all details of all messageboxes in verboseTim Jenssen2011-12-073-6/+11
| | | | | | | | - and not only for some and then only some information Change-Id: I9dce3cc895eeff864585db822ba3b8d91233b9d5 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* removed triggerControlScriptForCurrentPageTim Jenssen2011-12-073-7/+0
| | | | | | | | - it is not needed anymore Change-Id: If75bd18d390368feb4244da98457a75639a7b02f Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
* added PackageManagerCore::executeDetachedTim Jenssen2011-12-072-0/+18
| | | | | | | Change-Id: I005dc93b06f258ac46f9d79d916815cfacb966c6 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* use replaces for the arguments in PackageManagerCore::executeTim Jenssen2011-12-071-9/+18
| | | | | | | Change-Id: Ib3c71a769deff71766ac75f32c72e83929784f71 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* missid the root components itselfTim Jenssen2011-12-021-1/+1
| | | | | Change-Id: I6328d152d8795e04930bbbbb2d1d2f713eb84745 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* If we cancel an download, prevent the failure msgbox.kh12011-12-022-2/+6
| | | | | | | | | | | | | Make sure to check for cancel in httpError, as the error gets emited as soon as we call http abort in cancelDownload(). Later in the chain httpDone would reset m_canceled and cancelDownload would call httpDone now with an unset m_canceled, resulting in emmiting an error. Change-Id: Ic1e74bef83706dba42ce8d2cb444c08078fa1ed8 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Fix QTIFW-52.kh12011-12-011-9/+18
| | | | | | | | | | Do not set the application name and version during init, as this would set the packages info to modified. Thus if the packages info goes out of scope would trigger an components xml write. We now set the name and version when we start installing, or if is empty. Change-Id: I8503bab55f7d614bc859f3a3773eb4a0f7816d48 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Move the restart of the wizard into installer base.kh12011-12-012-5/+12
| | | | | | | | Also clear some more labels on restart or after new setings. Change-Id: I3a3727b0d4f2f43e13aafa5f6e499ac74277774c Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Fix QTIFW-85.kh12011-12-012-4/+13
| | | | | | | | | Do not use word wrap and provide a better size policy. Also elide the text if it does not fit the width of the widget. Change-Id: I18fbdd64c6aa7e07b66d36bf708f709d00787199 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Make sure we reset the package fetch state.kh12011-11-302-1/+6
| | | | | | | | | Fixes the problem that after we've updated, installed components, the ui would still show the old state and the "Next" button would behave strange. Change-Id: Iaeb480e69f52230a15233dfaf3ea3116e9728042 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Switch columns for better visability (Username/Password).kh12011-11-301-9/+10
| | | | | Change-Id: I69dd022b43b3c0e04f4de2c76be04a873d54fa30 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Force repaint of the wizard ui.kh12011-11-301-0/+4
| | | | | | | | | Fixes the "Next" button problem as reported by some of the tester. Still we should figure out where the event gets lost. Change-Id: I626b486ef220d33a89b9bd9cc8e3039dca171c9c Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Hide the automatic restart page.kh12011-11-303-5/+9
| | | | | | | Might also fix the double commit button seen by the tester. Change-Id: I67b0ac36eee97afcc6bba84e4f102ea056ea4bc0 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Fix warning about wrong initialization order.kh12011-11-301-1/+1
| | | | | Change-Id: I3cbcec3c8b22558b8e452be8abfa44b392e1c8b3 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* fix a crash if the replaces is not existingTim Jenssen2011-11-291-3/+8
| | | | | Change-Id: I2b65c343f701d67577e2b127b47054368ce583c7 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Update to the latest and greatest...kh12011-11-297-79/+86
| | | | | Change-Id: I7f0fb12735293e785229da22a8e794c2f7d7df96 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* Remove fetch and implement "lazy" fetch.kh12011-11-286-169/+141
| | | | | | | | | Now it feels better then to bring up the dialog and start the fetch instantly, the user now has the opportunity to edit the network settings first and on "Next" we fetch the tree. Change-Id: I1ebce333bf5157421f2b62afbe5630b0ec1e0134 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* compile fix for LinuxNiels Weber2011-11-281-1/+2
| | | | | Change-Id: Id2a87d393f154870fb6d7dbba747be083706280a Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Implement network settings dialog.kh12011-11-2811-59/+1524
| | | | | | | | | User settings are stored inside a network.xml file, e.g. proxy type, proxy authentification, repositories etc... Default repos are saved kind of encrypted inside the already existing ini file. Change-Id: Ie97f2e82af7faf4d15719c669a0fa4158b503ce3 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Update the test app to use a proxy factory as well.kh12011-11-281-0/+19
| | | | | Change-Id: I35fe8570b12109254a31758141e4159518ed2ac5 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Make it possible to set proxy factorys for the downloaders.kh12011-11-285-3/+34
| | | | | Change-Id: I1a728b60a196807fa8257b22e58165e2c55be787 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Add authentication support to the downloaders.kh12011-11-283-2/+23
| | | | | Change-Id: If2317d5aded40819f62fa942b3a8af53c954689c Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Fix a problem that isOfflineOnly returned true.kh12011-11-281-1/+4
| | | | | | | | | | This happend even in updater/ package manager mode when the original install was done using an offline installer. This can only be true if we are an installer. Change-Id: I345453dfc870b9945295371f5d6f8cb4a0057a50 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* Introduce our own proxy factory class.kh12011-11-282-0/+132
| | | | | | Change-Id: I4d08dd32dff7899962bf5e0ccd60a85b385033a3 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* Move the proxy factory base class into the downloader factory.kh12011-11-284-23/+29
| | | | | | | | | Remove some now superfluous code to silently try the system proxy in error case, as now we have a proxy factory set on every downloader. Change-Id: I3399ea473d2958dbf97d2f0048b60922eb98c74f Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Add the possibility to have an settings button int the ui.kh12011-11-282-5/+87
| | | | | | | | | | | Added some more code to be able to properly relayout the buttons after show/ hide of the settings button. We always need to call this now since QWizard won't take care of our own passed buttons. Change-Id: I8dc957ba43b79239164ab1e9032ffbd86b095501 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Rename function and call it earlier in the chain.kh12011-11-283-13/+14
| | | | | | Change-Id: Iebbbe1163939777c7a97f45f2926cd102fb2c845 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Cleanup.kh12011-11-287-11/+8
| | | | | | | | | Save some QLatin1String - QString conversion, remove dead code. Rename some functions, etc. Should not change much functionality. Change-Id: I42bfbe19d773e9fa2cc18e11e74f71ef271f4130 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Make it possible to stream the Repository class.kh12011-11-282-0/+34
| | | | | | | | Possible use cases are streams into QVariant->QSettings. Change-Id: Id92371886eda950749495558b50df04e5803ead8 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Extend Settings class to store proxy settings.kh12011-11-282-0/+61
| | | | | | Change-Id: I37589a25e294c63d5930ff9120f1af2063341df1 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Introduce some more set'ter to add repositories.kh12011-11-282-0/+21
| | | | | | Change-Id: Ic0c2a2362a5e9065410ffc548ab6120c605aef8d Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Let the app parse the arguments again in gui mode.kh12011-11-281-3/+2
| | | | | | | | | | Also do not stop on unknown arguments, this is rather stupid to do, just print the error message. Might fix a problem on OSX with session id... Change-Id: I9ca6903b0073ea54b398534c5273f7f0f2e50db4 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* Make sure to create components for local installed packages.kh12011-11-281-0/+16
| | | | | | | | | | | | Should fix a problem in case we point the repo to a complete different url or a component get's removed from the original server. The problem then was, there was no component created for the local installed package, which in case of update or package managment would remove the local package as no component cold be found for the stored operations. -> see runPackageUpdater Change-Id: I7394691c533609526d09e994f509b47b9cb9c206 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Refactor the code with the use of buildComponentTree.kh12011-11-253-82/+64
| | | | | | Change-Id: Id50f324e04a5afbf17631efece7e10caa6d41244 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Fix QtSDK-1070.kh12011-11-241-12/+16
| | | | | | | | Make sure the package manger hides components to replace even if they are not installed. Show only replacements instead. Change-Id: I07644747b9973dfe77c4cf582631be6d6ec267a8 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Fix warning about initialization order. Use scoped pointer.kh12011-11-241-5/+5
| | | | | Change-Id: I1ea34adb934d1aa1888741a3eda20026bac210dd Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Make archive info thread safe.kh12011-11-231-13/+24
| | | | | Change-Id: Ia5090ac54d845b9c026a503cdd1ac902c353c09e Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Some more code cosmetics.kh12011-11-231-322/+422
| | | | | Change-Id: If2a8d8ada04a0a9c89e6e7b52ff66565a12e1ac1 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Code cosmetics.kh12011-11-231-408/+408
| | | | | Change-Id: Ibaf3c8625c9c1bfcb7ddedefa4c7952e36ecf313 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Extend buffere size, move, add includes and defines.kh12011-11-233-10/+30
| | | | | Change-Id: Ic990012ca57bd97e50823de91bc9576dac6b7a34 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* remove autodependon need to check the replacements aswellTim Jenssen2011-11-231-3/+9
| | | | | Change-Id: I4e5002c773c45bd660c5d4f40c74a985316113bb Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Let the the gui application open a console on Windows.kh12011-11-233-53/+135
| | | | | | | | | | If running in verbose mode, redirect all output to our window. Change-Id: Id93fb0b81ceaa7f0ad5eda26d5d313529976f661 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* begininstallation has nothing todo with createOperationsTim Jenssen2011-11-231-1/+0
| | | | | | | - copy and paste error Change-Id: Iac33b200d4c2654679b036f03866fcf4cba03758 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* added --version description to command-line helpAlexander Lenhardt2011-11-221-0/+2
| | | | | Change-Id: I317ef287ced623eb18fa3a92acb90fcc1e53c93b Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* added command-line helpAlexander Lenhardt2011-11-221-0/+40
| | | | | | Change-Id: I034430cef3104ffcb6898eefdb5c421e15c5fa66 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>