aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager
Commit message (Collapse)AuthorAgeFilesLines
* ProjectExplorer: Remove BuildStepConfigWidgethjk2020-10-062-3/+3
| | | | | | | After the previous changes it was only an empty wrapper around QWidget. Change-Id: I58dcd82d8342c7de5e2df537044f6cf3de878a67 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Move BuildStepWidget::summary etc to BuildStephjk2020-10-051-3/+3
| | | | | | | | | | | | | The step is the source of information anyway, and available at the only place of use. No need to copy that over to the widget, neither for keeping it up-to-date there when the mechanism is already available in the step itself. This creates quite some potential for the simplification of the various createConfigWidget implementations in follow-up patches. Change-Id: I4474665f194a1ff7c5792ad086ed53c8d3ce13e6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Consolidate build/deploystep default display name handlinghjk2020-10-021-4/+1
| | | | | | | | Use the display name from the factory as default, override if needed. Change-Id: I03519c998432fea4120b0de8b2fc2686644635f2 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: get correct value for ANDROID_DEPLOYMENT_SETTINGS_FILE for Qt 6Assam Boudjelthia2020-10-021-13/+27
| | | | | | | | | | | | CMake with Qt 6 which uses android-${target}-deployment-settings.json file name, we use substitute ${target} with the root node target name to get the correct file name. Task-number: QTCREATORBUG-24678 Change-Id: Ib0c82b947b3217b6b763191b22d91ab9674fedce Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: use correct variable for Android SDK with CMake for Qt 6Assam Boudjelthia2020-10-021-7/+11
| | | | | | | | | | Qt 6 for Android with CMake uses ANDROID_SDK_ROOT (similar to qmake), instead of ANDROID_SDK. Task-number: QTCREATORBUG-24678 Change-Id: Ic858b8d76b41b57ef35864a1981ebd142d0cccfd Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: add prepare_apk_dir CMake target by defaultAssam Boudjelthia2020-09-281-1/+28
| | | | | | | | | | | | Qt 6 CMake build doesn't execute prepare_apk_dir by default (this is the equivalent of install step in qmake). Since we have the target for installing the build artifacts to android-build already present in the CMake targets list, it's better to just use it, instead of using another custom step just for that. Task-number: QTCREATORBUG-24679 Change-Id: I369d6ce513f9aaf917c5fcbb3f6aa44e36b97af8 Reviewed-by: hjk <hjk@qt.io>
* Utils: Consolidate LayoutBuilder interface a bithjk2020-09-242-2/+2
| | | | | | | | | | | | | - the var args template for addItems was overkill creating a lot of instantiations. Use a temporary list instead. - allow default constructed LayoutItems to be used for an empty cell, avoiding the use of a QLabel with empty text - add an addRow({...}) overload as convenience shortcut for .startNewRow().addItems({...} - rename startNewRow() to finishRow() Change-Id: I6d49dacbac3d7acf140ca526884ba1ceeeca2e0d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Android: Fix CMake parsing for Qt 6.0.0 kitsAssam Boudjelthia2020-09-231-0/+5
| | | | | | | | | Qt for Android 6.0 with CMake requires QT_HOST_PATH to be provided for CMake to properly parse and configure the project. Fixes: QTCREATORBUG-24660 Change-Id: Id5d77f900698ef4d19ec8e37b14e4e3234c74ea4 Reviewed-by: hjk <hjk@qt.io>
* Utils/ProjectExplorer: Move re-usabled bits of aspects to Utilshjk2020-09-236-9/+14
| | | | | | | | | | | Classes involved are BaseAspect and some derived classes, LayoutBuilder and VariableChooser. This is mostly mechanical, with various include/using changes to make it compile. Change-Id: I624a457f3555f102e541c4c71e33a9423af32250 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix Qt 6 build of ProjectExplorer and targets & build systemsEike Ziller2020-09-212-2/+2
| | | | | | | | | | | | QStringRef is gone. qsizetype vs int. QMultiHash::insertMulti is gone. QXmlStreamWriter writes UTF-8 by default. Task-number: QTCREATORBUG-24098 Change-Id: Id217e40a1f17993a84fc725976e9cb84618b0580 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Simplify use of AbstractProcessStep::init()hjk2020-09-161-5/+6
| | | | | | | | | | | | 1. Systematically check for AbstractProcessStep::init() first in derived classes. 2. Use setupProcessParameters(processParameters()); by default in the base implementation. 3. Drop all re-implementations that are effectively the same. Change-Id: I0ae54dd4909b354672a63ee56d0b7c2ea0732494 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-09-141-1/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/languageclient/languageclientcompletionassist.cpp Change-Id: If12e1c532e5623ef063681309a918e7b51117b1c
| * Android: Use c++_shared for STL as cxx_shared is not correctAndy Shaw2020-09-111-1/+1
| | | | | | | | | | | | | | | | | | This fixes a parsing problem from CMake as it will state: "Invalid Android STL: cxx_shared." This amends 01b0d4f8f561328628051f14776d056a4bc023b6 Change-Id: I315d36eac889ba53d76055814c6b43a453e1e2f7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Android: allow passing apps arguments via manifest on non-debug modeAssam Boudjelthia2020-09-111-0/+3
| | | | | | | | | | | | | | | | Uses 00a1e5da7e1aea373a7e6be1d51e1573ff167dd8. Task-number: QTCREATORBUG-23712 Change-Id: I9a7e134420b608815589578f3851abf150674fd3 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | CMake: Fix several issues with the CMakeBuildStephjk2020-09-112-202/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Store the selection of the "Current executable" target again (broke apparently with 2c822ae3) - Display the resolved target of the "Current executable" seletion in the command line, instead of the fixed " '<Current executable>' text - Make the "Current executable" translatable - Add a tooltip explaining what it is - Use a Utils::TreeModel instead of a QStandardItemModel for the target model - As side-effect, searching in the target view using Ctrl-F seems to magically work again. Change-Id: Ia4d0913f6e586f49f74da66651a9177437dad6d9 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | CMake: Slim down CMakeStep interfacehjk2020-09-092-14/+1
| | | | | | | | | | Change-Id: Ia2cce411647e434a9edd7ef2b66a187bad6d8c12 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | CMake: Use StringAspect for cmake argumentshjk2020-09-092-68/+32
| | | | | | | | | | Change-Id: I18e9af5f630a2b0a11a427848368c9f980819717 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Introduce a ProjectConfiguration::kit() functionhjk2020-09-094-8/+6
| | | | | | | | | | | | | | For convenience, and use it in some places. Change-Id: I8f7cb502b37b2fbf4cf2d17cac9c6299558332dc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | QtSupport: Add supportsMultipleQtAbis getterAlessandro Portale2020-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Introduce bool QtSupport::supportsMultipleQtAbis(). Let AndroidQtVersion respond according to the QVersionNumber. This allows to replace the version arithmetics in several places with straight forward (and better findable) function calls. Task-number: QTCREATORBUG-24471 Change-Id: Ib6e39fd6485a54e08ad66f84d4e2582989043419 Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterOrgad Shaneh2020-09-041-1/+1
|\| | | | | | | Change-Id: I8a2dca29595a0770f4162786b15a145f3f4133af
| * CMakePM: Fix removing cmake toolsChristian Stenger2020-09-041-1/+1
| | | | | | | | | | | | | | | | The id might be destroyed with its parent before trying to reference it again and put it into the list. Change-Id: Ic7bb053293b24f0f0109a1c6479f73b7cbec2dc0 Reviewed-by: hjk <hjk@qt.io>
* | TextEditor: use Utils::FilePath as file member in AssistInterfaceDavid Schulz2020-09-041-3/+3
| | | | | | | | | | Change-Id: I3bf9b013b9350411f918efdb9d1a36a2c22bf972 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Remove ProcessParameters::resolveAll()hjk2020-08-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On all code paths, this was implicit in a ProcessParameters::setCommandLine() which was on all code paths either called directly immediately before, or as part of ProcessStep::setupProcessParameters(). With ProcessParameters::setCommandLine() as only user, this could be inlined there. The effectiveWorkingDirectory() turned out to be out of place and rather accidentally working there and was moved to ProcessParameters::setWorkingDirectory(). Change-Id: I634f6086c2324e3cbecd3e5d50e22afc722abd3f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-211-2/+4
|\| | | | | | | | | | | | | Conflicts: CMakeLists.txt Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
| * CMake: Fix comparison of source paths when importingEike Ziller2020-08-181-2/+4
| | | | | | | | | | | | | | | | | | | | We need to check canonical paths with canonical paths. Otherwise we get a mismatch when using e.g. a linked directory for the source path on the command line and then try to import the build in Qt Creator. Change-Id: I153be74b6cfdf5070e023780604ce64c92df0e6d Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | CMake: Register CMake tools detected while scanning build directoriesWojciech Smigaj2020-08-201-1/+27
| | | | | | | | | | | | Fixes: QTCREATORBUG-24502 Change-Id: Idf96e666e783edbf8b0fbe4216affb80b0464104 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | CMake: Use new AbstractProcessStep convenience functionshjk2020-08-172-12/+10
| | | | | | | | | | | | | | | | | | This is actually a slight change in behavior insofar as the summary now uses the same environment as the build itself. This should not matter, or even be more correct. Change-Id: I48e5be6cb7b97606f80f563ba399c4b6ff61c3bf Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ProjectExplorer: Rename Base*Aspect to *Aspecthjk2020-08-141-1/+1
| | | | | | | | | | | | | | | | | | In most cases they are used directly, so there's not much Base* in that. Added the old name as alias as porting help for a while. Change-Id: I494a8a560b8996bcf74915ea3570b504df6a6b4c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-132-11/+9
|\| | | | | | | Change-Id: I1c426d95eedd82bd4470a64a9bafd734d23081ac
| * CMake: Parse project on initial loadChristian Kandeler2020-08-122-11/+9
| | | | | | | | | | | | | | | | | | | | When opening a project for the first time, the project has already been added to the session when the BuildSystem object is created, whereas the code expected a different order. Fixes: QTCREATORBUG-24318 Change-Id: I8ccfeab7da4e566670f61bfe677a293033bdfe44 Reviewed-by: hjk <hjk@qt.io>
* | CMakeProjectManager: Give InitialCMakeArguments a macroExpander iconAlessandro Portale2020-08-121-1/+2
| | | | | | | | | | Change-Id: Ia1025f2fcecd018ff106fd6b8b9e1cc640af500e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMakeProjectManager: Give build config widgets the place they deserveAlessandro Portale2020-08-121-2/+2
| | | | | | | | | | Change-Id: I10563b6b8820a9f4debbc4ca5fcbc50ba7f7a009 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-103-65/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/cmakeprojectmanager/cmakebuildstep.cpp src/plugins/cmakeprojectmanager/cmakebuildstep.h tests/auto/debugger/tst_namedemangler.cpp tests/auto/qml/codemodel/check/tst_check.cpp Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
| * Cmake: Fix compile output glitchChristian Kandeler2020-07-312-57/+60
| | | | | | | | | | | | | | | | | | | | | | Using a dedicated OutputLineParser ensures that we only ever see complete lines and thus prevents "partially red" lines in the compile output pane. Fixes: QTCREATORBUG-24209 Change-Id: I12b3de70b81789afe727b66e366facdcc81f8ab8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| * Android: Introduce constants for Android ABIsAlessandro Portale2020-07-261-4/+5
| | | | | | | | | | | | | | | | | | Avoiding string duplication prevents typo-related runtime errors and allows an IDE to use find symbol rather than plain text search. Change-Id: I7fba7c7c5cf90c0b371efce3b575537b2708dd0f Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* | Use IDE_DISPLAY_NAMERobert Loehning2020-08-031-1/+3
| | | | | | | | | | | | Change-Id: If8ae9399a40a460b535faeec2320d1450e5099c5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | CMakePlugin: Make cmake build settings widget multi selectableAsit Dhal2020-07-213-11/+64
| | | | | | | | | | | | Fixes: QTCREATORBUG-22659 Change-Id: I5c2b88a30f35baa3a3f2b33e2722c4523a8abe44 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Utils: Drop Utils::SkipEmptyParts againhjk2020-07-211-1/+1
| | | | | | | | | | | | | | | | We require Qt 5.14 nowadays. Change-Id: Iff245257d3cb19207007c0445ee13814e66152dd Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | CMakePM: Replace QRegExp by QRegularExpressionChristian Stenger2020-07-133-18/+26
|/ | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I295e2a9a92880b58b3f6103fe68824c379ab47a4 Reviewed-by: hjk <hjk@qt.io>
* Android: Prevent crash in case there is no Qt version sethjk2020-07-061-1/+1
| | | | | | | | For CMake build. Change-Id: I77946a5d7023a9cefc23baf243991949121e49ec Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.12' into 4.13Eike Ziller2020-07-061-2/+5
|\ | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/lldbbridge.py Change-Id: Ia444f6424fb35b9a539e157afcee868161535272
| * CMake: Fix handling of setting for Ninja pathEike Ziller2020-06-301-2/+5
| | | | | | | | | | | | | | | | When Ninja is installed via the installer, it writes the full path to the Ninja binary into the settings. Change-Id: I95a19c8c1afbf980c899fb1eeb8656e7e86ad4a2 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Core/Utils: Migrate further to Utils::Idhjk2020-07-0617-82/+81
| | | | | | | | | | | | | | | | The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 (cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake: Fix UI text capitalization and punctuationLeena Miettinen2020-07-022-3/+3
| | | | | | | | | | Change-Id: Id4adc0671357c646cbed5df3667addfc95130b73 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | CMake: Fix compiler warning about unused lambda captureChristian Kandeler2020-06-261-1/+1
| | | | | | | | | | Change-Id: Ie95512a247997764d41ca5c5f8ba4cb576f634aa Reviewed-by: David Schulz <david.schulz@qt.io>
* | Fix compiler warnings about several unused variablesArtur Shepilko2020-06-251-1/+1
| | | | | | | | | | Change-Id: Ic236efdfdfd997719187eec1c19ad2b7f6c044df Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake: Fix changing build directoryEike Ziller2020-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | It wasn't possible to change the build directory if the old directory didn't already contain a build. Amends 7e6e02eb0852837ba0f2c3aec445916b8403f1c2 Change-Id: I741f6981273a4e04cceabde5b15b5ad951535ef8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | CMake: Fix nested source groupsAaron Barany2020-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes source groups would start from the root directory rather than having the correct folder specified in CMake. This was because the incorrect path was being used to find the relative path. Forward baseDirectory to the overrideBaseDir parameter of addNestedNodes() to guarantee the proper directory is used as the base. Fixes: QTCREATORBUG-23896 Change-Id: I213c02a3fff3c10e4b6a58211600dd16ac257bbc Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Fix filtering in various hierarchical viewsEike Ziller2020-06-221-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The intermediate "category" nodes where never filtered out. CategorySortFilterModel was changed to use filterRegularExpression() and setFilterFixedString does not set that (it only affects filterRegExp() which we need to get rid off). Set a regular expression directly instead of a fixed string. Amends 47e576528e4f61c1e387e7ee89bc6b18b7ce3d94 Change-Id: I6f844027b83d66ca2d5088d83e6e84b01b9eda45 Reviewed-by: hjk <hjk@qt.io>
* | CMake: Update log output of CMake Project ImporterTobias Hunger2020-06-181-18/+18
| | | | | | | | | | Change-Id: I18c6890ecad58d6e078492af30c5509d9db766f9 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 15:22:12 +0000