summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: add example documentationLeena Miettinen2014-07-0923-3/+427
| | | | | | | | Add initial topic skeletons. The contents will be modified in subsequent patches. Change-Id: I33ca4180c7070d5ae2ca20a59f75608289d76344 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Calm down warnings.kh12014-07-095-16/+6
| | | | | | | | [-Wunused-private-field] and file has no symbols Change-Id: Ie9c9f53041711ee2ba42909fb88e0b9a8a8ebac9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Rename settings in config.xml filejkobus2014-07-0713-107/+110
| | | | | | | | | | | Rename UninstallerName to MaintenanceToolName (change its default value to "maintenancetool"). Rename UninstallerIniFile to MaintenanceToolIniFile. Change-Id: Ic8ceae80b43c6793ae9b0baacea2ea374a0f90d1 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Add licenseagreement exampleKai Koehne2014-07-076-0/+821
| | | | | | | | Add dedicated example showing how to ask for a license agreement. Change-Id: I42144fcd38fcde3e8018c1d4559847fc83854499 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Workaround for QFileInfo::isBundle().kh12014-07-046-8/+30
| | | | | | | | | | | | | | | For some reason the former code did not work anyore as expected, the issue seems to be in QFileInfo::isBundle or how we used it. To not depend on a possible fix in Qt, we now always resolve the path before we ask QFileInfo if it is a bundle. Fixes also the behavior change introduced in cead4555. On OSX, we get the .dat file passed that's inside the bundle, still we need to read the data from a .dat file that's located beside the app bundle... Change-Id: Idaa7adc6fbad6bd8e9ce90c383b34ea51fe40e8f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Rename pathes -> pathsjkobus2014-07-038-22/+20
| | | | | | Change-Id: I9ad2e5eba7df180dec63ec171d5260c01d9715b2 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Updated ChangelogNiels Weber2014-07-031-1/+3
| | | | | | Change-Id: Iea0ccf06cb6eea5b00fcc8415059fdc7b4205dfe Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Replace Q_OS_MAC with Q_OS_OSXNiels Weber2014-07-0318-41/+41
| | | | | | | | Q_OS_MAC also refers to iOS. Change-Id: I91603d0add90a0f3948453a6b9628814b0d9f80c Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Cleanup, use what we have in QThread.kh12014-07-031-18/+6
| | | | | | Change-Id: I6efc3ef90f8797b71a795f62423eda96f61934e5 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove check for Q_OS_QWS / QtopiaKai Koehne2014-07-031-2/+0
| | | | | | Change-Id: I778a7a8cc8c504b6ba54a05ad4e476830a5b28bc Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Remove unused methodjkobus2014-07-022-19/+0
| | | | | Change-Id: I7bdebcfd0cadd50b95a3674cd82aeb6c8f86300d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Revert change from QIODevice to QFileDevice.kh12014-07-024-154/+65
| | | | | | | | | | | Follow up on 924ebcdbc9b9e590a5f0905941e2d05ac34d4be2 (Part 2). Remove some unused methods. Cleanup some unused code. Add some documentation what the Archive class does and is used for. Add copy method and switch back the class to inherit from QIODevice as also the Archive class does not work as QFileDevice descent. Change-Id: Ia20f02c5aa53ba977fdc1d14785031b0cfbce386 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix broken tools after switching to QFileDevice.kh12014-07-026-613/+57
| | | | | | | | | | | Follow up on 924ebcdbc9b9e590a5f0905941e2d05ac34d4be2 (Part 1). Get rid of KDSaveFile, reuse QTemporaryFile. After changing KDSaveFile to inherit from QFileDevice, it turns out to be not working properly anymore and crashing e.g. binarycreator while using it. To save fixing it we just switch to QTemporaryFile. Change-Id: I785a04db91b431f5e122f193ecf2ef3c54e34b1c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove Qt 4 scopes in .pro filesKai Koehne2014-07-022-13/+4
| | | | | Change-Id: I8e0793700196ea49e06a5c46731afd258f6443c3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Doc: replace \a with \c in .qdoc filesLeena Miettinen2014-07-024-101/+101
| | | | | | | | | | The \a command should only be used in code documentation (in .cpp files), where QDoc uses it to check that all formal parameters are documented and emits warnings if they are not or if they are misspelled. Change-Id: I37710afcd860f9baa3042337aca98fac6701b997 Reviewed-by: Niels Weber <niels.weber@digia.com>
* Add optimized Qt configure flagsKai Koehne2014-07-022-6/+7
| | | | | | | | | Add -skip statements for unneeded modules. Also disable Qt features we don't need, including -developer-build. Change-Id: Ic82d8c0ef9f8cf172a1623268322b028fc74853c Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Rename "Package manager" into "Add or remove components"jkobus2014-07-021-1/+1
| | | | | | Change-Id: Iec557d94530d74cb8fffceebb92c8986bef62632 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Doc: add the list of C++ classes also to front pageLeena Miettinen2014-07-021-0/+1
| | | | | Change-Id: Ic4eb6378f6010cdaa014ea4b8e9ce3f07818eae3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Doc: update copyright year to 2014 in doc filesLeena Miettinen2014-07-016-6/+6
| | | | | Change-Id: I72e840dfb737f8e96edf09e2dce74b29c255c326 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Doc: update end user workflow sectionsLeena Miettinen2014-07-0112-21/+34
| | | | | | | | | | | Try to make it clearer what "adding components" means and that the Qt 5 installer is used as an example implementation in these sections. Update Qt 5 installer screenshots. Change-Id: I43f104b3a827b4e69313e01405bb088c52c46817 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Replace 'configure options' by 'configuration options'Kai Koehne2014-07-011-3/+3
| | | | | | | | This makes INSTALL in line with getting-started. Change-Id: I36e1141785c9068c03f653aa2d3d6cd3c347159e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Drop '-no-opengl' Qt configure argument for OS XKai Koehne2014-07-012-2/+2
| | | | | | | | Compilation for -no-opengl on Mac OS X only got fixed in 5.4, qtbase commit a12ba316161b23b . Change-Id: I74d2cfd6b42c673ee72fbd4977eda92a82618748 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Linux: Add -qt-xcb to recommended configure flagsKai Koehne2014-07-012-7/+21
| | | | | | | | Also drop trailing './' in command line, and adapt to new Mac naming conventions: The OS is just "OS X", not "Mac OS X" anymore. Change-Id: I95c18080261e54ed8abe1b9307340e834934fb61 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix build with Qt 5.4.0 or newerKai Koehne2014-06-301-1/+3
| | | | | | | qtaccessiblewidgets plugin got removed in Qt 5.4.0. Change-Id: I597c8aabea7d3548851136263f8d77bbd439baba Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Don't try to elevate user rights if impossiblekh12014-06-261-0/+14
| | | | | | | | | | On Windows, if the user doesn't have administrative rights, we have to query the system policy for UAC. If UAC is not enabled, it is obviously not possible to use UAC to elevate the user's rights. Change-Id: Ieccf112efb50a6426277b32516ab58ca467a364e Reviewed-by: Sascha Cunz <sascha.cunz@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Doc: do not use the deprecated \bold commandLeena Miettinen2014-06-252-7/+10
| | | | | | | | In Qt 5, you should use \b, but in these cases, you should rather use \e, for emphasis, or \c, for code. Change-Id: I68fe20394a180279b107986f4dbf4bc1fa54ede9 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix possible case of uninstalling whole windows.kh12014-06-242-45/+27
| | | | | | | | | | | | | | Task-number: QTIFW-511 In case we couldn't read the .dat file or the config file, target dir will return the path the application was started. Now we bail out early if one of the files is missing. Fixes also some outdated code mess when we switched from a single binary maintenance tool to the split binary version. Change-Id: I4c70ac4ca63142873ed1521df47d74331669b576 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Revert "Make the auto tests available by default."kh12014-06-242-20/+7
| | | | | | | | | | This reverts commit fca72823ea2a9c627e86d2fb769929999ed6fe43 to speed up compilation on slower systems. It introduces the possibility to set an environment variable or pass BUILDTESTS as argument to qmake to make the tests available. Change-Id: Iab5846473bac2dddbec85b45a7a7ad70552171a4 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix information for building static QtChristian Stenger2014-06-241-1/+1
| | | | | Change-Id: I376f1312d4b606fc75ea64331895a905f57f6f28 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Don't use QObject::tr().kh12014-06-2417-185/+251
| | | | | Change-Id: Icefbff9851a4e096a4b800adea7d17db756abe99 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Split out the file IO stuff and adjust other files respectively.kh12014-06-2419-448/+484
| | | | | | | | | Also adjust the API to use QFileDevice instead of QIODevice to make clear we just operate on files here and not on any possible device like sockets, processes etc... Change-Id: I4ecbb6e244fe4bb666ed12e62f9f5586bc1347f0 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix [-Wformat-security] warning.kh12014-06-241-3/+3
| | | | | | | Change-Id: Iae180cb0f13a39daacc1cadd04094bfddd33b6ab Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Initialize both client and server with default values.kh12014-06-2310-57/+61
| | | | | Change-Id: I51934b0de77b1062153f5f60be44d4bcf4be5ee5 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Doc: generate list of C++ classes and QML typesLeena Miettinen2014-06-204-9/+43
| | | | | | Change-Id: I56e1f94faff2cb8d9817daff4f61958aa53d6d78 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* binarycreator: add qico and qtaccessiblewidgets as QTPLUGINsRay Donnelly2014-06-201-1/+1
| | | | | | | | | | | Commit 807de076f4fee6c relies on the autoplugs mechanism (added in qtbase commit 4255ba40ab073af) to add the needed statically linked plugins; however because binarycreator is a console app it doesn't depend on gui (QT -= gui) this mechanism fails to add the plugins. Change-Id: If96b0e2c03d229ad1026602b8e8117babda03481 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Build fix.kh12014-06-191-1/+2
| | | | | Change-Id: Ie8081a79328022a098cdfe95d33d4dd52a1031d0 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Replace auto_ptrKai Koehne2014-06-191-12/+12
| | | | | | | | auto_ptr is deprecated in C++11. Use QScopedPointer instead. Change-Id: I63fd4de0a6edb329046ed9433e295407d95a9f95 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Enable QStringBuilderKai Koehne2014-06-193-7/+12
| | | | | | | QStringBuilder improves the speed of string concatenation a lot ... Change-Id: I9dedf7c3335ebf4a9194e837f9eb8135fae11356 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Enable C++11 mode in compilersKai Koehne2014-06-191-1/+1
| | | | | | | | Qt 5 uses C++11 features mostly for speeding up things. Change-Id: Idcb3a95cd24b44c5147ff2e14f468f069da5e0c3 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* 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>
* Updated ChangelogNiels Weber2014-06-181-2/+18
| | | | | Change-Id: I1f5797c0c1eda033f9ed20725e1885dfc9eeeadd Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/1.6'Tim Jenssen2014-06-184-20/+74
|\ | | | | | | Change-Id: I7358124780a6e1711a90e4d735795309db5f1b50
| * Update Changelog.Niels Weber2014-06-061-0/+9
| | | | | | | | | | Change-Id: I2fbf14be2b3a94a980121b40fb16ff637788345d Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Merge remote-tracking branch 'origin/1.5' into 1.6Tim Jenssen2014-06-061-1/+9
| |\ | | | | | | | | | Change-Id: I818c7e398e99c1c28d6b44bfe41223c356afbb80
| | * Updated Changelog1.5Niels Weber2014-06-051-1/+9
| | | | | | | | | | | | | | | Change-Id: Ib4acd1742a21e4cd92b7cf9a56267ac71c5d4365 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * | 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>