summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix AdminAuthorization implementation.kh12014-06-197-193/+43
| | | | | | | | | - execute() does the magic of getting privileges and starting the process - hasAdminRights() simply returns if we started privileged.. Change-Id: I0940a02556fe240af0ee7dfb068f7f8009eb683e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Remove trailing whitespaceKai Koehne2014-06-191-3/+3
| | | | | | Change-Id: I161e1b5908339a3553c2568afebd27a719ca4cce Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Merge remote-tracking branch 'origin/1.6'Tim Jenssen2014-06-183-19/+56
|\ | | | | | | Change-Id: I7358124780a6e1711a90e4d735795309db5f1b50
| * Make it possible to calculate dependencies from script.kh12014-06-052-18/+50
| | | | | | | | | | | | | | | | Task-number: QTIFW-503 Change-Id: Ic359d586f36669d4c1430c22e10b5a209ba6fc3c Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
| * Make sure we honor the updates xml checksum flag.kh12014-06-051-1/+6
| | | | | | | | | | | | Change-Id: I1fb7aec13c86c1018298d25d186f200c48d1d59e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Make cycles in component dependencies fatalkh12014-06-181-1/+6
| | | | | | | | | | | | | | | | | | | | Warn the user when sorting operations fails due to cyclic dependencies. Previously we would just continue, saving an incomplete list of operations. Change-Id: I0d80ad142e5d6936bbfab69835ff539a893cb180 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* | Respect AllowSpaceInPath morekh12014-06-181-4/+8
| | | | | | | | | | | | | | | | | | If TargetDir is not set but spaces are allowed in path, don't avoid spaces in the constructed default path. Change-Id: I0b38227400fbcd71f06990d475a8776040fafa4c Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* | Add important note.kh12014-06-161-0/+3
| | | | | | | | | | Change-Id: Ifa7364d561b8fbb3370f8e3930e62c040280fe17 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Fix crash while canceling the meta data unzip task.kh12014-06-161-3/+8
| | | | | | | | | | | | | | | | | | The crash happens cause in reset we do a delete later on the unzip tasks and then a second delete while not checking early enough for the set error code. Change-Id: Iee17cd6863435d25c0c999fb0cc4e05672de3cc8 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Use int instead of QFlag/Enum values (advised by Simon).kh12014-06-062-15/+11
| | | | | | | | | | | | Change-Id: I217205d1256b15432bc3647292bbcbd19077c3e4 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Expose qsTr to the scripts, makes component error example work.kh12014-06-062-2/+29
| | | | | | | | | | Change-Id: I73be2490182af8582b3e56b177e8ca26c950fa97 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* | Fix endless loop.kh12014-06-063-28/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caused by the fact that the settings wrapper did not support anything different then native format, we had to trick the wrapper into using its default QSettings object which in turn uses a QFile (which roundtrips to the admin server) to write the settings out (behind the scenes). The blocking appeared only on Linux cause there we try a native call fcntl(handle, F_SETLKW, &fl) to lock the file during sync, which blocks endless caused of the missing rights. The fix is to use the settings wrapper also for ini format, as both are supported (Ini and Native). Change-Id: I73131c4adf85ba175ba6af1e18acccc29451b14f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix tutorial examplejkobus2014-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - remove translations part - replace installation dir (root) with home in order to properly finish the installer wizard with default values - AllowSpaceInPath is now true by default (ChangeLog updated) Change-Id: I84e372ac4da05964d90851bf592fc87ee9409e3b Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Set the right ownership for the components we expose.kh12014-06-061-2/+5
| | | | | | | | | | | | | | | | Make sure we set the component ownership to c++, by default the script engine would take it and delete the component... Change-Id: If4ea905495566954ff804b636934c33eb118ccf3 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Disable copy constructor and assignment operator.kh12014-06-061-0/+8
| | | | | | | | | | Change-Id: Ib9cd6f7ac64b7af7f33ec9fd4c45a623625f3603 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Bring back the KeepAliveThread, fixes unexpected hang.kh12014-06-061-16/+16
| | | | | | | | | | Change-Id: I253e1f2b8f8032ec14a65f1748878b4a4f1a7ae5 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Fix change user interface example.kh12014-06-061-0/+10
| | | | | | | | | | | | | | | | We need to expose all child QObjects and pages to the QJSEngine, missed these when switching over from QScriptEngine. Change-Id: Ic538d3f19da544c82093e630d7395bfc3e68da7a Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* | Silence warning, we know what we are doing (-Wunused-value).kh12014-06-051-1/+1
| | | | | | | | | | Change-Id: I3a944e0ff38b10b3440fa3c3dfcce378f284aacc Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Check if the static is still there, otherwise we might crash.kh12014-06-051-0/+3
| | | | | | | | | | | | Change-Id: I6bd03000813ff8434ae552eba76823a408d10436 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fix replace maintenance tool binary.kh12014-06-044-53/+45
| | | | | | | | | | | | | | | | | | | | Missing QInstaller::init() did lead to crashes cause of uninitialized lib7z (in case we used a zipped file as input). In verbose mode console did not show up. Get rid of KDSaveFile as it complicated to code unnecessary. Change-Id: I5911c895d7763e4ce919b1d4761568e47b244b1b Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Initialize the client as early as possible.kh12014-06-042-2/+10
| | | | | | | | | | | | | | | | | | | | Due do the fact that we can have several threads call to RemoteClient::instance() at the same time, some objects might get a not fully initialized object back. Most notable members of private class where initialized differently or not at all. Change-Id: I80fc4ad59583e3784c0e9f002e23d3df91f127b2 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Fix some reorder warningsNiels Weber2014-06-032-3/+3
| | | | | | | | | | Change-Id: I714224c5616d40c5f36598a4682a07dfa0ff7136 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | We need to pass the socket to the connect function.kh12014-06-034-18/+19
| | | | | | | | | | | | | | | | | | | | The keep alive thread does try to delete the socket it gets from the connect method, but since the socket was created in a different thread and we will hit the: "Socket notifiers cannot be disabled from another thread" warning. Change-Id: Ibafcd67f8cdb51b365c3ef230f1ebd447bdd306a Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Replace client-server classes and update implementations.kh12014-06-0316-2307/+503
| | | | | | | | | | | | | | | | | | | | Remove superfluous file engine tests. Introduce auto test for newly added client server classes. Fix some wrong implementations serverside for settings array handling and broken arguments in process wrapper. Replace all other parts that with new implementations. Remove now unused classes. Change-Id: I6f9e836993096a2c2c06b06f2b06d7aa4b287e56 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Introduce new classes for client-server communication.kh12014-06-0318-6/+2715
| | | | | | | | | | | | | | Still based on what we had already, though more separated. Change-Id: I4cce298003a4ffc2ebcec01fea1a07adfbfdf990 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Replace script with js engine.kh12014-06-0311-335/+374
| | | | | | | | | | Change-Id: Ic9c88e27dca1e936ba09a3776df3df7ec166c606 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fix annoying warning that the file can not be deleted.kh12014-06-032-11/+6
| | | | | | | | | | | | | | | | | | Define the downloadable target inside the remote directory it belongs to, avoids the unnecessary delete inside the task destructor. The temporary dir deleter will take care of it. Change-Id: I4858a71dc714a33f1afb00eb2b2a167294899461 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Use QTemporaryDir instead of our homemade solution.kh12014-06-033-74/+10
| | | | | | | | | | | | Change-Id: Ia584a9b2f954df5c29a2f0aa5f12b201b2bfbcc4 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | We need to have these files in the include list too.kh12014-06-021-1/+2
| | | | | | | | | | Change-Id: I9da3f099d154d2d610179b5b181ecec58b9b3a2a Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Some more qt5 only fixes.kh12014-06-022-26/+8
| | | | | | | | | | Change-Id: I7c190667f7ae243289b3e08ff76f9f398178bc24 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Merge remote-tracking branch 'origin/1.6'Oswald Buddenhagen2014-06-0212-435/+40
|\| | | | | | | | | | | | | | | | | | | Conflicts: dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri Change-Id: I32a2a17b8fd7dc0f1f9c12272fc5f814ea5d86cb
| * Revert "Use QTemporaryFile instead of some homebrew construction."kh12014-05-221-4/+5
| | | | | | | | | | | | | | | | | | | | This reverts commit 23d0dc225dbe3f89d0411c0195d8bcd066c3bdc7. Thought the implementation looks right in the first place, it will fail if we are asking for a random name inside a directory where we do not have access rights. QTemporaryFile will not roundtrip to the admin server and therefor return an empty string. Change-Id: I0bd716b10e43242f5da5dd939b06213040256d67 Reviewed-by: Niels Weber <niels.weber@digia.com>
| * Check if the file we are writing to is a file.kh12014-05-221-1/+8
| | | | | | | | | | | | | | Remove superfluous remove, since if the file exists but we can't open it it might belong to someone else, so keep it... Change-Id: Ic541fe134dad76983088d4b3d243d15e78f9fed4 Reviewed-by: Niels Weber <niels.weber@digia.com>
| * Fix HTTP proxy settings do not have any effect.kh12014-05-211-0/+2
| | | | | | | | | | | | Task-number: QTIFW-498 Change-Id: I58ebb5a6a65313540a6ee3bb20d872ef32631c5b Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Avoid 'Too many open files' on MacKai Koehne2014-05-141-1/+9
| | | | | | | | | | | | | | | | | | Increase the number of file descriptors that the process can open to the maximum allowed. By default, Mac OS X only allows 256 file descriptors, which can easily be reached. Change-Id: Ie4e5ab1051d8e3bf1cb39747f629360915a22d97 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * Cleanup. Remove some unused and broken code.kh12014-05-145-420/+0
| | | | | | | | | | Change-Id: I6b1c9b4cd406da91c6642a9cad0e225d8473df20 Reviewed-by: Niels Weber <niels.weber@digia.com>
| * Remove 'What's this' button from wizard (Windows).kh12014-05-091-0/+1
| | | | | | | | | | | | | | Task-number: QTIFW-488 Change-Id: Ibb3915c03e97d7f4334f203731f294b0abedf669 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Obviously we need to pass the authenticator everywhere.kh12014-05-091-0/+6
| | | | | | | | | | | | Change-Id: I8f51582f54ef3c58d439dfffb7ba7802bc47b797 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Improve error message for ConsumeOutputOperationKai Koehne2014-04-251-3/+3
| | | | | | | | | | | | | | | | | | Avoid a warning that e.g. 'qmake.exe.exe' does not exist, when the argument was qmake.exe. Task-number: QTBUG-38343 Change-Id: Icdfc8ffc8e112b23fb0e789d6041ea7eefaf55c3 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * ConsumeOutput: Use local encoding to parse executable outputKai Koehne2014-04-231-1/+1
| | | | | | | | | | | | | | | | | | We don't really know which encoding the app will use. local 8 bit seems to be the best bet though. Change-Id: Ic4d8668ed5f5a6eca55d44348ae54adb903bf447 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
| * Mac: Do not require Xcode command line toolsEike Ziller2014-04-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | /usr/bin/xcrun is the tool to use for running build tools from the current Xcode installation, without the need to install anything beside it. Task-number: QTBUG-38015 Change-Id: I32ba8bfac2f2c49e863fe8aeeecaf3df80afb8c8 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Cleanup to support Qt5 only.kh12014-06-0220-145/+23
| | | | | | | | | | Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Delete orphaned fileSze Howe Koh2014-05-281-548/+0
| | | | | | | | | | | | | | | | GetRepositoryMetaInfoJob was replaced by MetadataJob long ago. See commit eee37a74faeb5bd36794981b4a5b10144fc244e4. Change-Id: Ia895462ff39c3677005e5ec0ef42fea14a3c45da Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix component still visible after it's set "Virtual".kh12014-05-164-0/+19
| | | | | | | | | | | | | | | | Task-number: QTIFW-466 Change-Id: I6a5e4d0d20703e2d4e867bb2619c82dac0b8a64c Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Make sure we return an empty path if value is not set.kh12014-04-281-8/+13
| | | | | | | | | | Change-Id: Ibc95455b7e8ff428c173c6eb0d181a9a655fd023 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge IntroductionPage and IntroductionPageImpl.kh12014-04-265-398/+352
| | | | | | | | | | Change-Id: Ib8a08779979ccde42dab8a1bd83b27a24f318de0 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge TargetDirectoryPage and TargetDirectoryPageImpl.kh12014-04-244-206/+141
| | | | | | | | | | Change-Id: I613dbcb431452729bb672b5546e4108c0f613299 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Calculate the component order before using it.kh12014-04-241-1/+2
| | | | | | | | | | Change-Id: Ic96b45f013e5f7f740677542ca07914adf7a48d2 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix and update how the sha files and packages are downloaded.kh12014-04-241-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fixes a possible messed up download chain once the archive download failed. We need in turn call fetchNextArchiveHash as we will remove both the hash and the package, though this does not reset the last checksum and therefore the next proper archive download will compare to the wrong SHA. Change-Id: Ib4e569de4f5482123da7357a09b7bd087b5d6cbb Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Provide an API to get all wizard pages from java script.kh12014-04-243-14/+34
| | | | | | | | | | | | | | Task-number: QTIFW-477 Change-Id: Ic83df19d20ce310e3e295de929020182e1878273 Reviewed-by: Niels Weber <niels.weber@digia.com>