aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qtsupport/qtoptionspage.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Qt Support: Fix UI textLeena Miettinen2020-07-011-1/+1
| | | | | | | The end bracket does not seem to have a function in the UI. Change-Id: I2c89c7692c208a83b8ed18f5132247481d73e7f0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-151-7/+30
|\ | | | | | | | | | | | | Conflicts: src/plugins/mcusupport/mcusupportsdk.cpp Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6
| * Fix availability of "Link with Qt" info barEike Ziller2020-05-141-7/+30
| | | | | | | | | | | | | | | | | | The info bar should never appear if the button is disabled, for example because the Qt Creator directory is not accessible. Fixes: QTCREATORBUG-23900 Change-Id: I819c87f5ca51f69f34bd462fca8e877be3544100 Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-201-8/+21
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/android/androidconfigurations.cpp src/plugins/qtsupport/qtoptionspage.cpp Change-Id: I91ee3e771ab630ac3a54be53ac4be6d3c1c46950
| * Fix "Link with Qt" for Qt offline installersEike Ziller2020-04-201-6/+20
| | | | | | | | | | | | | | | | The Qt offline installers do not necessarily write a QtCreator.ini. Check for qtversion.xml as well. Change-Id: Ib7fd9f39444a8eec817646dd495fdc94696906e8 Reviewed-by: hjk <hjk@qt.io>
* | QtSupport: Fix HTML - and don't translate itRobert Loehning2020-04-071-4/+5
|/ | | | | | Change-Id: I06fc0186af648047651ee5e69be9727cec69bd40 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Core: Provide empty implementation for IOptionPageWidget::finish()hjk2020-01-151-1/+0
| | | | | | | | Having it pure virtual only lead to a lot of unnecessary re-implementation. Change-Id: I37f71d1a160e21b93c7c73a6304b0eb6d5f0441d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QtSupport: Move option widget decalaration in .cpphjk2020-01-141-81/+149
| | | | | | | | Slimmer interface, allow removing m_ui indirections, du -s .obj: 66684 -> 65868 Change-Id: I686745017a5d239f41e256fd28f595a1fc3b5bac Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QtSupport: Update QtOptionsPagehjk2020-01-101-23/+3
| | | | | Change-Id: I34eba5a968914a1afdd168f7dd428329e3770c5a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QtSupport: Fix compile for gcc5.3Christian Stenger2020-01-101-1/+1
| | | | | Change-Id: Ia3dddfbc117b4be670ecd126666ed3280c00b77b Reviewed-by: David Schulz <david.schulz@qt.io>
* Provide option to "link" Qt Creator to a Qt installationEike Ziller2020-01-091-10/+187
| | | | | | | | | | Allows making e.g. a Qt Creator-only offline installation aware of a Qt installation, with auto-registration of Qt versions and kits. Change-Id: Ia92dd9d4dbf34acb3a01713207699ff3f14cea12 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Help: Add option to only register highest versioned Qt documentationEike Ziller2019-12-161-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | In Options > Kits > Qt Versions. And make it the default. It registers each documentation file only for the highest registered Qt version. If you have Qt 5.12 and Qt 5.13 registered, but only installed QtWebEngine for Qt 5.12, you'll get QtWebEngine documentation for Qt 5.12, but the other documentation is from Qt 5.13. That is usually sufficient, since the documentation still contains "old" API, and new API is flagged with "since". This avoids registering a lot of documentation, which creates a startup performance issue, and also leads to usually unneeded popups for which Qt version some documentation should be shown. The option also allows going back to registering all documentation, and no Qt documentation at all. Fixes: QTCREATORBUG-21482 Fixes: QTCREATORBUG-22799 Task-number: QTCREATORBUG-10004 Change-Id: I1c7bc73982d48d8e53f5083e2fa851b6c5f60f80 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmakeProjectManager: Add tooltip to QtVersionItemhjk2019-12-021-0/+10
| | | | | | | Shows the qmake path for now. Change-Id: Ic0fc400f122ee1670b16aec7db4f01d04ac8575d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QtSupport: Use Utils::DisplayName in BaseQtVersionChristian Kandeler2019-10-161-1/+1
| | | | | | Task-number: QTCREATORBUG-16281 Change-Id: Idd697594bfd83d8f26c4cbfe5ff2d9472609836b Reviewed-by: hjk <hjk@qt.io>
* QtSupport: Replace 0 with nullptrTobias Hunger2019-10-011-6/+6
| | | | | | | ... and let clang-format clean up the indentation. Change-Id: I56401804899628813e54c5b573806ab149885e67 Reviewed-by: hjk <hjk@qt.io>
* QtSupport: Pimpl BaseQtVersionhjk2019-08-211-2/+2
| | | | | | | | | | | | | | | | Too much for a public header. Also, lump the implementations of BaseQtVersion and QtVersionFactory into a common .cpp. The classes are tightly coupled, having them in one place allows to get rid of several accessors in their interfaces. At least ProString vanishes from the .h, and thanks to C++'s peculiar idea of object constness, we can lie less obviously in the implementation about effectively mutable data members. Change-Id: Ibf594d71dcba163d6f09ba65e3ecb76174295099 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Some clang-tidy -use-modernize-nullptrhjk2019-08-011-9/+9
| | | | | Change-Id: I1bed5e85a5b7948d08502a72a10f80baa075c204 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Avoid warning on empty expressionshjk2019-07-231-2/+2
| | | | | | | | 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>
* Utils: Rename FileName to FilePathhjk2019-05-281-3/+3
| | | | | | | | More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Use an alias for QList<Abi>hjk2019-05-271-3/+3
| | | | | Change-Id: I69231c5974620ae30296bfc4e0ab41c900d95a3c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Remove FileName::isNullhjk2019-05-131-2/+2
| | | | | | | ... and its uses in order to shrink the FileName interface. Change-Id: I4b9a229d98ad53c4f189e381c89241981ddbed2e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QtSupport: Replace BaseQtVersion::clone()hjk2019-02-191-2/+2
| | | | | | | | | | | | | | | | ... by a mechanism that doesn't require re-implementation in each derived class. A QtVersion's type() is uniquely defined by the supported type of the factory creating it, so that factory can be found and used for cloning. Non-base data is copied by a fromMap(toMap()) dance as done in the project configurations. As a side-effect, the *QtVersion copy constructors are not used and not needed anymore. Change-Id: I3aa5a0fd90a27dd115769e0573647cb5669641a0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QtSupport: Remove QtOptionsPageWidget::qtVersionsDumpUpdated slothjk2019-02-181-13/+0
| | | | | | | Never called anymore. Change-Id: I6d2eaebbbf72d4e05aafeb4006d35bcdaa8a75d4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QtSupport: Move option page display name to .cpphjk2019-02-181-1/+1
| | | | | | | | This makes the string appear in one .o and one .so instead of 39 .o and 14 .o. Change-Id: Ia38ca9a24aa22990be57c36a5eccf8e41dbc6a4c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QtSupport: Remove BaseQtVersion::dumpUpdatedFor signalhjk2019-02-141-3/+0
| | | | | | | Never emitted anymore. Change-Id: I049e90dc77c70e57284ec967644a188735360310 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Clean up options page category display name and icon set upEike Ziller2018-04-231-3/+0
| | | | | | | | | | | | | | In cases where plugins extend an existing settings category of a plugin that they depend on anyhow, they do not need to specify the translated display name and icon for that category. Some options pages were already not setting the icon, but still the translated name, which makes even less sense. Clean up this mess, only setting display name and icon if that is necessary. Change-Id: I8bc9d0c51b11d48f1d847337838704d663e70b45 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* ProjectExplorer: Make the Options/Kits Category icon themableAlessandro Portale2018-02-281-1/+2
| | | | | Change-Id: I70c3fffd11b217937d6a85e88da1de688031b8e0 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Create and populate 'Kits' settings categoryhjk2018-01-241-3/+3
| | | | | | | | | | | | | | Kits are a central concept and structure in anything build and run related in Creator, their organization is crucial for the functionality of Creator and deserve to be emphasized over other, often more cosmetic settings. This is the first step of two, the second step would be moving the Device (list) page also in this category, possibly after some reorganization in the Device category. Change-Id: I4abc89472d0575c691fc9e5051397833126e5456 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QtSupport: Fix warnings about unused lambda capturesTobias Hunger2017-09-191-2/+2
| | | | | Change-Id: I445c616c03da701d2f0c9480191bef7812b9943f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Utils: Introduce TreeItem::{begin,end}hjk2017-02-081-2/+2
| | | | | | | | | | | ... and use this to reduce the number of explicit uses of m_children. Despite of being shorter code by itself it is a step towards having an explicit LeafItem object that doesn't explicitly store a(n empty) vector of child nodes. Change-Id: If8db85e2f1134dd1578a78d31235bf57a28f863a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QtOptionsPageWidget::validInformation(): Use ToolChainManager::toolChain()Friedemann Kleint2017-01-201-1/+8
| | | | | | | | Use a predicate to check whether any toolchain can be found instead of searching through all of them. Change-Id: I6d4417c548b37629dc43c11e313250c24777a5ca Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QtVersionManager: Rename QtVersionManager::unsortedVersions(...)Tobias Hunger2017-01-181-1/+1
| | | | | | | | | Rename QtVersionManager::unsortedVersions(...) to QtVersionManager::versions(...). This is what you should use, so make that the obvious choice. Change-Id: Ice6e195d9aad7968ce87d378323627347b22bc74 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* BaseQtVersion: Allow for a predicate when retrieving Qt versionsTobias Hunger2017-01-171-1/+1
| | | | | | | | | Make methods used to retrieve Qt versions from the Qt versions manager take a predicate to select the interesting version. Change-Id: I9218c57bae6d5033d49d618dfc0da41fe578444d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QtVersionItem: Remove unused field toolchainIdFriedemann Kleint2017-01-111-16/+0
| | | | | | | | Saves some iterations over the toolchains when opening the QtOptionsPage. Change-Id: I0d5d0fc7f501b201d6baacdbfc330c1287c4bc5c Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Rename the "ERROR" icon to "CRITICAL"Ulf Hermann2017-01-021-1/+1
| | | | | | | | | | | | | We mostly use this icon in terms of showing messages which might be informational, warnings, or errors. We cannot call the icon "ERROR" as that clashes with some macro on windows. To be more inline with Qt's predefined messaging macros (qDebug(), qInfo(), qWarning(), qCritical(), qFatal()), we rename the icon to "CRITICAL" and regroup the entries in the header to suggest this usage. Change-Id: I89880919d7ca54ea9c86de384eb29f375bf3075f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QtSupport: Make error message about missing compiler more verboseFriedemann Kleint2016-11-251-9/+22
| | | | | | | List the ABIs the Qt version has in case no compiler can be found. Change-Id: If2c0e6052e234638b318ce1f92c255163fb68c3f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Qt options page: Simplify code a bitTobias Hunger2016-10-271-6/+1
| | | | | Change-Id: I70ea3134550c01f6c81f8a15d2730dc906d834a7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QtSupport: Do not show Type column in Qt options pageTobias Hunger2016-10-271-1/+1
| | | | | | | Nothing ever fills that column, so do not bother to show it. Change-Id: I5787aa72ee5c414fbf01ca01eed3aea20b6b7201 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Qt: Do not send dataChanged if nothing changedTobias Hunger2016-10-261-0/+2
| | | | | | | | | | | | When setting the warning/error icon on a Qt version in the Qt options page: Do not send dataChanged if the icon has not actually changed. This fixes the selection getting broken when two Qt versions happen to have the same displayName. Task-number: QTCREATORBUG-16644 Change-Id: I7722fbc021388be237e59a59bd136c61f611ad52 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Core: Make IOptionsPage::categoryIcon a Utils::IconAlessandro Portale2016-09-201-1/+1
| | | | | | | This is necessary for themable + HighDPI icons in the options dialog. Change-Id: I8e3ff87a24591af40bb76b39cd970443d7678fae Reviewed-by: hjk <hjk@qt.io>
* Move icons to UtilsUlf Hermann2016-08-051-3/+3
| | | | | | | This way we can use them from libraries, not only from plugins. Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Utils: Streamline TreeModel APIhjk2016-07-271-9/+9
| | | | | | | | | | | | | | The LeveledTreeModel case is general enough to cover the UniformTreeModel case, so merge them and rename to TreeModel. The former TreeModel is now BaseTreeModel. BaseTreeModels should not be instantiated directly, a tree model with non-uniform basic items is available as TreeModel<>. Done-with: Eike Ziller <eike.ziller@qt.io> Change-Id: I64a65617ab68c0cde39cf65f4bc092ef808ee6fb Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TreeModel: Introduce a destroyItem() convenience functionhjk2016-07-061-10/+5
| | | | | | | Shorthand for delete takeItem(...). Change-Id: Icb7b60e5c19aa0d21650eefff65f7eb55e9f90b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TreeModel: Add a StaticTreeItem(QString) convenience constructorhjk2016-06-171-2/+2
| | | | | | | | | Covers the common case and hopefully avoids the recurring MSVC problem with initializer lists in this location. Change-Id: I1b2bbb083f9fc86af3b51b8f52615fb70c832b95 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QtSupport: Elide in middle of option page textshjk2016-06-161-1/+1
| | | | | | | | | Not eliding makes long qmake paths nasty to ready. It was intentionally introduced to fix QTCREATORBUG-4893, but overall ElideMiddle appears usable to me. Change-Id: I6882e802f5ea8ca222056e4bdcd7870023889d7d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* msvc2013 can not handle 1 item initializer listsTim Jenssen2016-06-151-2/+2
| | | | | | Change-Id: I44b3c3888f15a6b68ddaed2777b90cf4057792b1 Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* QtSupport: Make changed Qt version names bold in version dialoghjk2016-06-151-11/+24
| | | | | | | Mimic what other Build&Run views do. Change-Id: I6abb13816b5fe17f9aeeb38b0041c1f9b11a98ec Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QtSupport: Use a LeveledTreeModel in option pagehjk2016-06-151-89/+36
| | | | | | | Less code, less casting. Change-Id: I44400914d722211612562c47286ac4d7fc5511b7 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* TreeModel: Introduce a StaticTreeItemhjk2016-06-151-18/+14
| | | | | | | | This splits out the case of static string displays from the TreeItem base class, making the base more lightweight. Change-Id: If1f442011ec60094399a41b65d9b5015f432f82e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QtSupport: Use Qt5-style connectsOrgad Shaneh2016-06-061-2/+2
| | | | | | | The heavy lifting was done by clazy. Change-Id: I24cb0cd088b74364320cdd34282d7b15305a93bf Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 23:27:05 +0000