summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/qmlproject.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* QmlProjectManager: Remove dead codeTobias Hunger2019-08-131-5/+0
| | | | | Change-Id: I174aaaa9bde229aaeaded32835858243972e5086 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Use RAII pattern for parsing start/stop signallingTobias Hunger2019-08-091-2/+2
| | | | | Change-Id: I13de537140f265db3e3d0ab1cd924d6897cd90c8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Add convenience Project::addTargetFor{Default,}Kithjk2019-08-011-2/+4
| | | | | | | Less noise on the user side. Change-Id: I5cdf4af4910a3cc1ee0af1b43fcbc7329a6d59db Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/4.10'Tim Jenssen2019-07-041-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/libs/utils/synchronousprocess.cpp src/plugins/baremetal/iarewtoolchain.cpp src/plugins/cmakeprojectmanager/cmakeproject.cpp tests/unit/unittest/CMakeLists.txt Change-Id: I124ad492df403286751e175d27fe36487ddf6d07
| * More Utils::toSet/toListhjk2019-07-041-1/+1
| | | | | | | | | | | | | | ... and unrelated cosmetic changes. Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Enable macro editing for the Clang indexerMarco Bubke2019-06-131-1/+1
|/ | | | | | | | Refactor much of the code from Environment* classes to NameValue* classes to share it with the preprocessor macro settings. Change-Id: Ica4ee817aa338230c422b30d91240d266248d226 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Utils: Rename FileName to FilePathhjk2019-05-281-12/+12
| | | | | | | | 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: Introduce a alias for QList<Tasks>hjk2019-05-281-2/+2
| | | | | Change-Id: I91391ad22b420926b0f512cac23cfe009048b218 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlProject: Implement basic support for QmlFileSelectorThomas Hartmann2019-04-251-0/+14
| | | | | | | | | This patch adds support for QmlFileSelector for QmlProject and Qt Quick Designer. Task-number: QDS-590 Change-Id: I0cc043d3ec9578008ec879b36fe834b70fb8c5ad Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* RemoteLinux: Retrieve deployment info from local install rootChristian Kandeler2019-04-231-0/+5
| | | | | | | | | | | | | | | | This provides correct deployment information as seen by the build system when Qt Creator cannot retrieve it directly. It's most useful for autotools and cmake projects, but can also help with qmake in certain edge cases. [ChangeLog] It is no longer necessary to provide a QtCreatorDeployment.txt file when using CMake projects with remote Linux devices. Fixes: QTCREATORBUG-21855 Change-Id: I27e07a45dd1565e489f4b573cc3fff8191c57d9b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Remove FileNode's isGenerated constructor boolhjk2019-02-251-2/+2
| | | | | | | Use setter of base class, similar to setListInProject() before. Change-Id: Id620f0084a5dec0410f29c80f8f6393a6bcd5050 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Rename KitInformation to KitAspectChristian Kandeler2019-02-111-4/+4
| | | | | | | | | | | The name "KitInformation" does not properly convey the fact that it represents a certain *aspect* of a kit. The same goes for "KitConfigWidget", which in addition was inconsistent with "KitInformation". We now use "KitAspect" and "KitAspectWidget". Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97 Reviewed-by: hjk <hjk@qt.io>
* QmlProject: update mainFile after renaming itTim Jenssen2019-01-231-0/+6
| | | | | | | | | | | | Set mainFile at the QmlProject and replaces the string inside the .qmlproject file. If that file is open and modified just save that, it is not nice but qmake projects haves the same at the moment. Task-number: QTCREATORBUG-10629 Change-Id: Ia3916644bacfc65862802e3dc5361edd50951d35 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-06-111-1/+1
|\ | | | | | | Change-Id: I762dbddb0f337e9a5fc4b113c7876813e9f45c9c
| * Projects: Fix capitalization in messagesLeena Miettinen2018-06-081-1/+1
| | | | | | | | | | Change-Id: I1928fe11a3a23c0577ecc941d259d310a211e86f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | QmlProject: Remove unnecessary codeTobias Hunger2018-06-011-13/+0
|/ | | | | | | The normal RunConfiguration already triggers this. Change-Id: I33f8704e28768efc264a2e2e717284ba7615dc08 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectExplorer: Add and use addNestedNode(...) that takes unique_ptrTobias Hunger2018-05-021-2/+2
| | | | | Change-Id: Ieb26721d053111fb350494e31d1f6da3fe642420 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* ProjectExplorer: Use unique_ptr for Project::setRootProjectNodeTobias Hunger2018-05-021-2/+2
| | | | | Change-Id: If63a49d0eecfb93adcc6076fcb3208c87603af10 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* ProjectExplorer: Hide build page for projects that do not buildTobias Hunger2018-04-191-7/+5
| | | | | Change-Id: I56feaab67690b5ece7379a9c1f676392230de107 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ProjectExplorer: Report project-specific kit errors/warningsTobias Hunger2018-04-191-34/+26
| | | | | | | | | Report project-specific warnings about the kit used in Project Mode. E.g. a python project should not complain about missing toolchains, while a qmake project should. Change-Id: I5ce6742683cdeffc7ff3f1a3e8f0b89aee9aa0b4 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlProject: simplify codeTim Jenssen2018-04-061-4/+2
| | | | | Change-Id: I3cfee42b63bf840bf2ecde54c5f2d277d7a32e7c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlProject: Fix selection of supported kitsTobias Hunger2018-03-091-1/+1
| | | | | | | | | This now fixes the auto-selection of kits for me. Task-number: QTCREATORBUG-19717 Change-Id: I39581ab2471211e9553c345164bb3ce788242dad Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QmlProject: Unify selection of supported kitsTobias Hunger2018-03-091-37/+35
| | | | | | Change-Id: Ic33e9688d823bd09664e5dc74fe5253cb5fcbc58 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QmlProject: Fix import paths for code modelThomas Hartmann2018-02-261-1/+12
| | | | | | | | | | | This fixes a regression introduced by 30638df441515901c6d43b2c67a5ca4a53eaf814. Custom import paths have to be absolute for the code model. Change-Id: I232229fa58c3900fe684ca4529b2ed08bf93e8be Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlProject: Add support for setting the environmentThomas Hartmann2018-02-021-0/+7
| | | | | | | | | | | This allows setting arbitrary environment variables in the .qmlproject. This is required for example qtquickcontrols2.conf and QT_AUTO_SCREEN_SCALE_FACTOR. Task-number: QTCREATORBUG-19513 Change-Id: I8421a9fc7f85d24b3564f1b60f383be3838f2af4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlProjectManager: Prepare for running on remote devicesUlf Hermann2018-01-291-16/+80
| | | | | | | | | | We add a "targetDirectory" property to the file format and fill in the deployment data. (cherry picked from commit fba61c5b55052c382e030748fa6e2703abb5401d) Change-Id: If207cd5c77175c54cffdb5df92ea85c425cd3191 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Remove qmlsceneCommand() and qmlViewerCommand() from BaseQtVersionUlf Hermann2018-01-081-1/+3
| | | | | | | | | | | | | | | | | | qmlviewer is QtQuick1 and not supported anymore. The qmlscene command is in general not a property of the Qt version but of the target device, as we generally assume Qt binaries to be preinstalled on the target and qmlscene is executed on the target. DesktopQtVersion retains a method to retrieve the qmlscene path as there target == host and having the method available enables us to warn if the binary is missing. Also, QmlProjectManager needs to pick the qmlscene command from the Qt version if it's a desktop Qt. Change-Id: I2ee0f993e60b96d672080db2db0a6abe5ca933e3 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlProject: Remove unneeded reimplementation of rootProjectNodehjk2018-01-031-5/+0
| | | | | Change-Id: I0ffd72ae6be2cc94daf3e84a713c55088d463ab1 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QmlProject: Avoid error messages about missing build configurationsUlf Hermann2017-12-211-0/+7
| | | | | | | | Override the target setup, so that we don't try to initialize build configurations. Change-Id: I8f8022c705ea54dd66df828fdb4837d4a41bc96e Reviewed-by: hjk <hjk@qt.io>
* Use project id uniformly as project contexthjk2017-12-201-1/+0
| | | | | | | | | | | | | | | | | | | The possibly intented flexibility e.g. to have different project types share the same idea of a common context was never used, in all cases we had a 1:1 relation ship between project ids and ids that were used as context. This led to oversights like the one fixed in 60fb35a2. This patch here uses the project id unconditionally as context and drops all context ids. If we'll ever have the situation where the original flexibility was needed, Project::projectContext() could be made virtual and overridden were needed. Also, the context was never modified for any given project, so the updating machinery is not needed. Change-Id: I3f7fac0ed5e4704e126558987c48577f26082dfd Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Use ids in RunConfigFactory:: setSupportedProjectTypehjk2017-12-191-1/+2
| | | | | | | More similar to what build/deploy uses. Change-Id: Icf8bd7031d00a6e2831f8c1f3b1bdcaa8bf259b4 Reviewed-by: hjk <hjk@qt.io>
* QmlProjectManager: Fix warning about unused lambda captureTobias Hunger2017-12-011-1/+1
| | | | | Change-Id: I3fd8f89dc3f5f54a7479c7e1d118766fedd66ba7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlProjectManager: Drop support for QtQuick1Ulf Hermann2017-11-301-50/+7
| | | | | Change-Id: Id60c9768d8fad03f588207af07bba676dbfc76fc Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlProjectManager: Detect file types correctlyUlf Hermann2017-11-231-4/+4
| | | | | | | | Just calling everything "Source" is not very helpful. Change-Id: I74a19e46782aa301c5726130200aeb16ef916d78 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Introduce base class for enabled/disabled project configurationTobias Hunger2017-07-281-1/+1
| | | | | | | | | | ... and use this as a base for all RunConfigurations. Clean out code in the individual run configurations dealing with their enabled/disabled state. Change-Id: Icc2ea136b056f7aea7ce96480b4402459d7ac0ce Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Project: Move signalling of parsing state into ProjectTobias Hunger2017-07-261-1/+2
| | | | | | | Get rid of duplicated code to do such signaling in derived Project types. Change-Id: I26914a1d751d72ee65c15a7943e0e7f34978f042 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlProject: List .qmlproject file in project treeTobias Hunger2017-04-241-0/+1
| | | | | | | Task-number: QTCREATORBUG-18057 Change-Id: I6a38093d1b6fdaeac7920746395cfbebc595d062 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Project: Unify handling of displayNameTobias Hunger2017-04-071-5/+1
| | | | | | | | Unify the handling of displayName with a proper changed signal across all projects. Change-Id: I7e503528854b85f6f38de4b0943775f82a0d6123 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Project: Move ProjectDocument setup into Project classTobias Hunger2017-03-291-3/+1
| | | | | Change-Id: I5c0ec79ddf066e37660fb9a6b24f9d882355d511 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Provide ProjectDocument and use it in all projectsTobias Hunger2017-03-291-3/+2
| | | | | Change-Id: I6e054ebf1043bd1f6748f1567f35c68394bd6528 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Handle project file list globallyTobias Hunger2017-03-271-19/+4
| | | | | | | | | | | | | | | Handle the generation of the list of files in a project globally, based on the project tree. Creator now has the concept of TreeManagers which can enrich the project tree with additional data (e.g. the files found in a resource file), which the project does not necessarily know about. So use that tree to find the files that belong to a project instead of implementing similar features in each project. Change-Id: Ia375a914a1f2c0adaa427f9eda834eec2db07f68 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* QmlProject: Simplify interface a bithjk2017-03-151-24/+10
| | | | | | | Remove unneeded code and don't repeately fetch a singleton value. Change-Id: I718a44c28be7ef8718f813f987f45b32cbcd7ad5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/4.2' into 4.3Orgad Shaneh2017-03-141-0/+1
|\ | | | | | | Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
| * QRegExp include cleanupSamuel Gaist2017-03-131-0/+1
| | | | | | | | | | | | | | This patch adds the missing include statements for QRegExp. Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | ProjectExplorer: Add a FolderNode::addNestedNode() functionhjk2017-03-141-6/+4
| | | | | | | | | | | | | | | | | | | | | | Also, rename buildTree() to addNestedNodes(), it's really adding things, not recompletely (re-)building the subtree. Use it whenever possible to avoid intermediate lists of items to insert. Change-Id: I5fde41e5b164a8a292410bd381a85f5efadf3471 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | ProjectExplorer: Create initial project treeTobias Hunger2017-03-101-4/+1
| | | | | | | | | | | | | | | | | | | | | | Create an initial project tree with a ProjectNode and a FileNode for the project file itself. Fix the Projects to not implement their own tree before they have better data. Change-Id: I147ccd5603d22d1d60880a97f30fd8c271eac88c Reviewed-by: hjk <hjk@qt.io>
* | Make all projects generate a fresh project treeTobias Hunger2017-03-101-2/+3
| | | | | | | | | | | | | | | | Do not update the existing project tree anymore: Start a fresh one and throw the old one away. Change-Id: Ifabe293b6ca668b0672516a6d81acd5346d98fe5 Reviewed-by: hjk <hjk@qt.io>
* | ProjectExplorer: Follow up on too-much-magic in IProjectManagerhjk2017-03-091-4/+5
| | | | | | | | | | | | | | | | Use a ProjectManager::registerProjectType<Project>(MimeType) function, removing cryptic IProjectManager object ownership. Change-Id: I212cd25bd4ee757022a8cb0decb4b8de3a112d12 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | QmlProject: Move project tree generation out of the ProjectNodesTobias Hunger2017-03-011-2/+19
| | | | | | | | | | Change-Id: Ic0dbd0762f92191ee7d7eac47cb5385e1d3b9575 Reviewed-by: hjk <hjk@qt.io>
* | ProjectManagers: Cleanuphjk2017-02-281-7/+2
| | | | | | | | | | | | | | | | Remove unused class members, declarations, includes, unneeded ::projectManager overloads etc. Change-Id: I0f4ae87414faca226554722e2a9147cb5512495d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
View Lorry Controller Status