aboutsummaryrefslogtreecommitdiffstats
path: root/src/tools/sdktool/addtoolchainoperation.cpp
Commit message (Collapse)AuthorAgeFilesLines
* SdkTool: Fork utils/persistentsettingshjk2023-03-061-4/+1
| | | | | | | | | And a few helper classes. This allows SdkTool being build without Creator's Utils, and does not impose restrictions on the development there. Change-Id: Id15db9293f343ad2aeee5c09cc819d112ec144e4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Rename most FilePath::{from,to}Variant uses to {from,to}Settingshjk2023-01-101-1/+1
| | | | | | | | Specifies the main purpose more clearly. The remaining ones a "true" (internal) variants in models and as action data. Change-Id: I8dd3c846e419f29d88283c2f48268ef6685b19fe Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Port from qAsConst() to std::as_const()Marc Mutz2022-10-071-2/+2
| | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I88edd91395849574436299b8badda21bb93bea39 Reviewed-by: hjk <hjk@qt.io>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* SdkTool: Remove foreach / Q_FOREACH usageArtem Sokolovskii2022-05-301-4/+4
| | | | | | | Task-number: QTCREATORBUG-27464 Change-Id: I231597f60c7ddad00f7166e7d09c1c5b2ff48657 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* SdkTool: Fix build with Qt5Christian Stenger2022-04-051-0/+1
| | | | | | | Amends c246caf7a96b1d. Change-Id: I5835751f7312acbe8f171c3e61d4836111849421 Reviewed-by: hjk <hjk@qt.io>
* sdktool: Change tests to use QTestMarcus Tillmanns2022-04-041-63/+96
| | | | | | | | * Moved all sdktool code into a static library, allowing us to link against the actual functionality in unittests * Convert all tests to proper unittests Change-Id: I5c93be0faecbd8b68e0923655483c870a2f408b5 Reviewed-by: hjk <hjk@qt.io>
* SdkTool: Use slightly less repetitive approach for operation interfacehjk2022-02-101-30/+25
| | | | | | Change-Id: I4d1d205c610df39be6a810dfda3049ae14a06806 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* SdkTool: Allow remote paths in various operationshjk2021-11-191-4/+2
| | | | | | | | QDir::cleanPath() doesn't work well with the scheme://... syntax. Change-Id: I2d2a86e416251ea2396b67ab1e5831444d4a979a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* sdktool: Re-add compatibility hack for old language IDsEike Ziller2021-04-221-1/+18
| | | | | | | | | | | | This was removed in 6baf09bf91cac8ba71765ab470376541034d6ce5. Even though sdktool doesn't need to write these old IDs anymore, it still must support them for --language for a while, because older Qt installer components still use the numerical values (and will not be updated). Task-number: QTBUG-92949 Change-Id: I7483e52e331fe676b60d7b401f8a6f6510fd1789 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Remove toolchain settings compatibility with <= 4.3hjk2020-11-061-25/+1
| | | | | | | | As data point: Ubuntu 18.04 has Qt Creator 4.5. Change-Id: I2794197e511666b3931fb8efc2669a574e6f1ac9 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Avoid warning on empty expressionshjk2019-07-231-1/+1
| | | | | | | | For some reason, Q_UNUSED includes already a semicolon, adding one on the user side creates an additional empty statement. Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* sdktool: Adapt testsChristian Stenger2019-06-031-2/+2
| | | | | | | | | The names for registered Qt, cmake and toolchain must no more be unique. Amends e9e4c27e3a3f157291a231b8a746bb76dea525b7. Change-Id: Icea00636f3632148f209616de3473816e12e4655 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* sdktool: Do not fiddle with display namesEike Ziller2019-05-071-8/+1
| | | | | | | | | | | | | | | | | | sdktool made the "display names" unique by potentially adding a number. This has multiple drawbacks: - The display name can contain variables that lead to unique _expanded_ names - Adding a number doesn't really help for distinguishing things - That number is then hard-baked into the install settings Installers should take care that they register identifiable names. And if we really want to ensure unique names, then Qt Creator can do that itself, or even better leave the user to do it, because a number doesn't really help anyhow. Fixes: QTCREATORBUG-17909 Change-Id: Id0f44c0cbe457047a0713bda4980fb5d4bc5bcaa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* SDKtool: Fix testsTobias Hunger2018-06-221-3/+3
| | | | | Change-Id: I64e7d415bed1e6cea055d4d80102c8fa98434361 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* app_version.h: Make IDE name configurableTobias Hunger2017-09-051-1/+1
| | | | | | Change-Id: I993f452c8d09cf89e9a2958fc8e36b7d2c17ee6f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* SDKtool: Write toolchains compatible with Qt Creator 4.2 and 4.3Tobias Hunger2017-03-161-1/+25
| | | | | | | | | Make sure the toolchains xml file written by sdktool is compatible with both Qt Creator 4.2 and 4.3 by mapping the --language field accordingly. Change-Id: Ie8c289c8fe7d49ce95e924e89b4e369a62469e64 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Remove spaces in initializer listsTim Jenssen2017-02-221-9/+9
| | | | | | | Format initializer lists code style like. Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013 Reviewed-by: hjk <hjk@qt.io>
* SDKtool: Default to C++ for newly added toolchains without a languageTobias Hunger2016-12-141-1/+3
| | | | | Change-Id: I0002c0e0a81fd44064931a437f5c4b1e3095586c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* SDKtool: Add toolchain language supportTobias Hunger2016-07-211-10/+27
| | | | | Change-Id: I882cc129a603c758369446f947a961ccd2fd4490 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* SDKTool: Fix compile for Qt5.6Christian Stenger2016-07-201-4/+5
| | | | | Change-Id: I9154ffbc09187a851c409b2b1ae9d2d8109f1c15 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* SDKtool: De-noise addtoolchainoperationTobias Hunger2016-07-201-70/+67
| | | | | Change-Id: I94c2fae6e5fdd6384fd0acf2b626062b41719b07 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/share* and src/tools Change-Id: I78aa5d4a1d76212964e467de7676c1fcb2b777d6 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* SDKtool: Make sure to use '/' as path separatorTobias Hunger2016-01-191-1/+3
| | | | | | | | All internal paths in Qt Creator are using '/' as path separator. Make sure to normalize paths set via the SDKtool to that convention. Change-Id: If7ef250d49686a0f60d08516b718eb7c84a059ef Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Fix parsing of old settings with sdktoolKai Koehne2015-06-031-0/+2
| | | | | | | | | | | | With commit 5aba7fb09504e1a the sdktool started to save id's in a QString (instead of a QByteArray). Commit b2e3f0262bbf5de4 then adapted also the parsing. However, this broke the parsing of existing settings still using a QByteArray. Task-number: QTCREATORBUG-14545 Change-Id: I6c991d9d130602c7e9b3146b4d7b17555056a8ef Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Sdktool: Add switch to set environment for kits.Tobias Hunger2015-05-041-1/+1
| | | | | | | | | | Use --env TEST=somevalue or --env TEST (to unset TEST) once per environment variable you want to set/unset. Task-number: QTCREATORBUG-14342 Change-Id: Ia968aeb55a9702d12bc0beb9a38bdd8309a18559 Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Sdktool: Fix default kit handlingTobias Hunger2015-05-041-1/+1
| | | | | | | | | | The default kit is addressed by its id, not its number for a long time now. Update sdktool accordingly. Change-Id: Iad0d0c6eda2aa824fa8add99871db7efebb30e75 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* SdkTool: Use Qt Creator doctypesOrgad Shaneh2014-07-081-3/+3
| | | | | | | Simplify filename conversion while at it Change-Id: I0a7473aa42626a04214887f1cc82abe536233a78 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* SDKtool: Check for existing objects when creating kitsRainer Keller2014-03-041-11/+21
| | | | | | | | | Check for existing Qt versions, toolchains and devices if those ids are given. Change-Id: I0447d55e01cc40e43669ba7999126b0260974c0b Reviewed-by: Rainer Keller <rainer.keller@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* SDKtool: Fix detection of existing tool chainsTobias Hunger2014-02-211-1/+1
| | | | | Change-Id: Ie45dd4288b61606eb8bc9e9a73b0b4a9c823e9f2 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* SDKtool: Rename findValues method to findValueTobias Hunger2014-02-201-1/+1
| | | | | | | It only searches for one value. Change-Id: If780de3a919c41a03c9c0a978688fd1ea0411eb9 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* SDKtool: Consistently use const char X[] for constants in .cpp filesTobias Hunger2013-10-291-9/+9
| | | | | Change-Id: Iee70ddb526a1751120be40bfd8d2ae01b27b80b8 Reviewed-by: hjk <hjk121@nokiamail.com>
* SDKtool: Make the addtoolchain operation a bit less verboseTobias Hunger2013-10-291-1/+0
| | | | | Change-Id: Ie60f20964da4636afa53eaa5bb8adf4cad63f98c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Don't return negative numbers in sdktoolKai Koehne2013-07-081-2/+2
| | | | | | | | | | | | Negative return values are interpreted as 'process crashed' on Windows: QTBUG-28735 . This in turn means the installer framework always shows an error dialog. By using positive numbers even for error conditions the installer can decide to ignore certain errors instead. Change-Id: Ib5cdd461372ac13fe417feb6ff43a7424c159f68 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* SDKtool: Fix warning in test codeTobias Hunger2013-06-181-1/+1
| | | | | Change-Id: I6b6ce64298f7d937658148a88aa7c0d0fa7b2689 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-05-231-1/+1
|\
| * sdktool: Add operations: Fix adding to a empty map, check the right mapDaniel Teske2013-05-171-1/+1
| | | | | | | | | | Change-Id: Iddcf85d3a19bed28baa9bd4c5f964c370f8c9c42 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Fix some Krazy warnings about non-const ref iterator.Friedemann Kleint2013-03-111-1/+1
|/ | | | | Change-Id: I1c78f5f5a7174002cd25bea109d5fe795530cdb5 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* SDKtool: Fix removal of toolchainsTobias Hunger2013-02-221-3/+3
| | | | | | Change-Id: If66745582adcae1dbdb101cecc426280c1be182f Reviewed-by: Rainer Keller <rainer.keller@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* SDKtool: Fix return values and improve error reportingTobias Hunger2013-02-071-16/+24
| | | | | Change-Id: I1a44a39d5cd96be48608fdb4fab252a51046971e Reviewed-by: David Faure <david.faure@kdab.com>
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* sdktool: Fix MSVC warnings about comparison (!<int> == number).Friedemann Kleint2012-09-281-1/+1
| | | | | Change-Id: I74be70ed1693160acab5c4be5da09d004bf0801c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Add sdktoolTobias Hunger2012-09-211-0/+280
Add a tool to ease configuration of Qt versions, tool chains and kits with Qt Creator for the SDK and similar systems. Change-Id: I9727dd25ea359a935ea494b035a59411eb3529b8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>