Commit Graph

34 Commits

Author SHA1 Message Date
Eike Ziller
e9e4c27e3a sdktool: Do not fiddle with display names
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>
2019-05-07 08:09:56 +00:00
Tobias Hunger
172d6184a5 SDKtool: Fix tests
Change-Id: I64e7d415bed1e6cea055d4d80102c8fa98434361
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-22 10:27:39 +00:00
Tobias Hunger
4ef01c961e app_version.h: Make IDE name configurable
Change-Id: I993f452c8d09cf89e9a2958fc8e36b7d2c17ee6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-05 10:19:48 +00:00
Tobias Hunger
9e71f3b08d SDKtool: Write toolchains compatible with Qt Creator 4.2 and 4.3
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>
2017-03-16 14:25:45 +00:00
Tim Jenssen
2631ffabd5 Remove spaces in initializer lists
Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
2017-02-22 16:25:09 +00:00
Tobias Hunger
3840685998 SDKtool: Default to C++ for newly added toolchains without a language
Change-Id: I0002c0e0a81fd44064931a437f5c4b1e3095586c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 14:32:40 +00:00
Tobias Hunger
396ee16635 SDKtool: Add toolchain language support
Change-Id: I882cc129a603c758369446f947a961ccd2fd4490
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-21 15:21:45 +00:00
Christian Stenger
2281386199 SDKTool: Fix compile for Qt5.6
Change-Id: I9154ffbc09187a851c409b2b1ae9d2d8109f1c15
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-20 09:17:42 +00:00
Tobias Hunger
922e5e8a77 SDKtool: De-noise addtoolchainoperation
Change-Id: I94c2fae6e5fdd6384fd0acf2b626062b41719b07
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-20 08:19:07 +00:00
Tobias Hunger
1b4321279f Update License according to agreement with Free Qt Foundation
* Update files in src/share* and src/tools

Change-Id: I78aa5d4a1d76212964e467de7676c1fcb2b777d6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:48:57 +00:00
Tobias Hunger
cc817d508f SDKtool: Make sure to use '/' as path separator
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>
2016-01-19 15:15:57 +00:00
Kai Koehne
d1dd20aa31 Fix parsing of old settings with sdktool
With commit 5aba7fb095 the sdktool started to save id's in a QString
(instead of a QByteArray). Commit b2e3f0262b 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>
2015-06-03 11:04:50 +00:00
Tobias Hunger
b2e3f0262b Sdktool: Add switch to set environment for kits.
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>
2015-05-04 13:50:34 +00:00
Tobias Hunger
5aba7fb095 Sdktool: Fix default kit handling
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>
2015-05-04 13:49:19 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Orgad Shaneh
382b1d43eb SdkTool: Use Qt Creator doctypes
Simplify filename conversion while at it

Change-Id: I0a7473aa42626a04214887f1cc82abe536233a78
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-08 12:44:16 +02:00
Rainer Keller
07f7dd9c14 SDKtool: Check for existing objects when creating kits
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>
2014-03-04 17:29:31 +01:00
Tobias Hunger
3c12077c80 SDKtool: Fix detection of existing tool chains
Change-Id: Ie45dd4288b61606eb8bc9e9a73b0b4a9c823e9f2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-21 11:19:41 +01:00
Tobias Hunger
fd2c2df87c SDKtool: Rename findValues method to findValue
It only searches for one value.

Change-Id: If780de3a919c41a03c9c0a978688fd1ea0411eb9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-20 14:37:30 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Tobias Hunger
85997b0bc1 SDKtool: Consistently use const char X[] for constants in .cpp files
Change-Id: Iee70ddb526a1751120be40bfd8d2ae01b27b80b8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 18:11:13 +01:00
Tobias Hunger
69efa6e0ec SDKtool: Make the addtoolchain operation a bit less verbose
Change-Id: Ie60f20964da4636afa53eaa5bb8adf4cad63f98c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 16:45:22 +01:00
Kai Koehne
108899ef8f Don't return negative numbers in sdktool
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>
2013-07-08 11:33:32 +02:00
Tobias Hunger
d1370824a5 SDKtool: Fix warning in test code
Change-Id: I6b6ce64298f7d937658148a88aa7c0d0fa7b2689
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-18 21:18:02 +02:00
Eike Ziller
ef5d3796d5 Merge remote-tracking branch 'origin/2.7' into 2.8 2013-05-23 07:25:34 +02:00
Daniel Teske
4bb73adad6 sdktool: Add operations: Fix adding to a empty map, check the right map
Change-Id: Iddcf85d3a19bed28baa9bd4c5f964c370f8c9c42
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-17 12:33:58 +02:00
Friedemann Kleint
056e8aa4c2 Fix some Krazy warnings about non-const ref iterator.
Change-Id: I1c78f5f5a7174002cd25bea109d5fe795530cdb5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-11 17:31:07 +01:00
Tobias Hunger
fcb1693e83 SDKtool: Fix removal of toolchains
Change-Id: If66745582adcae1dbdb101cecc426280c1be182f
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-22 15:49:02 +01:00
Tobias Hunger
56582e8c06 SDKtool: Fix return values and improve error reporting
Change-Id: I1a44a39d5cd96be48608fdb4fab252a51046971e
Reviewed-by: David Faure <david.faure@kdab.com>
2013-02-07 12:16:45 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Friedemann Kleint
6dad4586c6 sdktool: Fix MSVC warnings about comparison (!<int> == number).
Change-Id: I74be70ed1693160acab5c4be5da09d004bf0801c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-28 09:59:28 +02:00
Tobias Hunger
4f36ad63ce Add sdktool
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>
2012-09-21 17:07:10 +02:00