summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager
Commit message (Collapse)AuthorAgeFilesLines
* CMake: fix UI textv3.6.0-beta1Leena Miettinen2015-10-232-10/+10
| | | | | | Change-Id: I6803aa799e495007358dbc5f5ee6b8e1d2c6e874 Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Introduce Profile build modeUlf Hermann2015-10-201-5/+4
| | | | | | | | | | | | We define a Profile build to be a Release build with separate debug info. You can thus change a given build from Release to Profile of vice versa by toggling the separate debug info checkbox. The messaging for future user interaction about Profile builds has to take this into account. Task-number: QTCREATORBUG-14009 Change-Id: I62a5b13993b20bf36329b1eefa8b1b6096f31644 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* CMakeProjectManager: Remember the preferNinja settingBenjamin Zeller2015-10-091-1/+1
| | | | | | | | | | | There was a problem in the CMakeSettingsPage that prevented the preferNinja setting to be remembered. This patch fixes it. Task-number: QTCREATORBUG-15162 Change-Id: I9ffaa67e05f2c99b5e9136f3c98004c68d03dede Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Cmake: Fix MSVC warningOrgad Shaneh2015-09-291-1/+1
| | | | | | | cmakeautocompleter.cpp:113: warning: C4129: '(' : unrecognized character escape sequence Change-Id: I4dccf3a0690a9c755c1e4672bfa669deaf893be2 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* CMake: Indentation and matching brace insertion for the CMake editorJan Dalheimer2015-09-267-4/+404
| | | | | | | | | Adds the following improvements to the CMake editor: * Indentation support (both through Ctrl+I and when pressing enter) * Insertion of matching paranthesis and quotes (pressing '(' inserts ')') Change-Id: If9a63b08b3e0897989e4d8ac69e3acc072b0b825 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Simplify logic for showing UnconfiguredTargetPanel/TargetPanelDaniel Teske2015-09-181-1/+1
| | | | | | | This doesn't change when the those panes are shown. Change-Id: Ie5a2d27321e5268f59775892198999a8414a0adb Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* CMake: Rewrite logic for kit selectionDaniel Teske2015-09-1610-179/+189
| | | | | | | | | | | | | | | | | | | | | | | | | Some time ago the all the wizards for the Plain C++ were coalesced into one wizard. Since then the wizard asks first for the targets via a targetsetuppage and then in the CMakeOpenProjectWizard asked for the kit again. This patch clean thats up, by always using the TargetSetupPage for kit selection and removing code from the CMakeOpenProjectWizard for kit selection. It also adds more types of buildconfigurations Offer: Debug, Release, ReleaseWithDebugInfo, MinSizeRelease with the corresponding -DCMAKE_BUILD_TYPE parameters. That argument is saved in the build configuration and used once for the first cmake run. (Subsequent runs of cmake don't require passing that to cmake again.) Also do not require running cmake on creating the buildconfiguraiton, instead postpone that until the buildconfiguration is made active. With the current cmake wizard, selecting multiple kits would show a dialog per buildconfiguration. Change-Id: I3bb806113f4f529f8e291830647d2515a6c4df8a Task-number: QTCREATORBUG-12219 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ProjectNode: Provide default implementations of a few functionsDaniel Teske2015-09-152-57/+0
| | | | | | | Since a lot of derived classes can make use of those. Change-Id: I051542e8d318476348d753de4d4c0a30b3a9ed62 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-09-041-0/+2
|\ | | | | | | Change-Id: Ife5fdcd71b0adc99d4297a28a64515e9e93d7864
| * CMake: Fix project tree displaying "." foldersRobert Loehning2015-09-011-0/+2
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-14994 Change-Id: Iea5a820083b8fc1974a749992f937965285370b6 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Utils: Rename PathChooser::changed() signal.Christian Kandeler2015-09-034-4/+4
| | | | | | | | | | | | | | | | | | The name is overly generic, particularly with a pathChanged() signal also present. Rename to "rawPathChanged", which adequately describes the semantics. Change-Id: Ia62b8b0a97a794cb6d5ad6b8ce0abcd36b5f5cdb Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | CMakeProjectManager: Use factories to create runconfigBenjamin Zeller2015-09-031-24/+3
| | | | | | | | | | | | | | | | | | | | | | At the moment RC factories are ignored when creating runconfigurations or updating them. This patch changes the behavior so the RCs are first created/removed and then updated to match the build targets. This way plugins can provide custom factories and RCs for cmake projects. Change-Id: I4a7797e7382784e33ecf016e322eab00e20c07e0 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-09-014-38/+55
|\ \ | |/ | | | | Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
| * Fix various context menu actions from project managersDaniel Teske2015-08-312-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct pattern is this: The actions in the build menu are supposed to be for the startup project. They should use the global context and be manually hidden/shown if the startup project changes. This fixes a crash on assigning keyboard shortcut to the edit files context menu action. The slot connected assumed that the action could only be triggered via the context menu. By using ProjectTree;:currentProject() the code now works even if the project tree is not actually focused. It also fixes that the "Run CMake" action was shown even in the build menu, even though a non cmake project was the startup project. Change-Id: I0bb8086d8b1078b4c71c3b5ba9d7f8596757e724 Task-number: QTCREATORBUG-14728 Task-number: QTCREATORBUG-14768 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| * Cmake: Read the build.ninja file only onceDaniel Teske2015-08-312-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The first getCmakeCXXFlags that reads the build.ninja file stores the contents in the inout parameter cachedBuildNinja. Further calls to getCMakeCXXFlags just use this cached value. This prevents excessive locking of this file while constructing the code model information. Change-Id: I81e1431194bed6913c69abb2d954068c999a5c1b Task-number: QTCREATORBUG-14639 Reviewed-by: Tom Tanner Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Cmake Open Project: Allow opening projects that have cmake errorsDaniel Teske2015-08-312-1/+17
| | | | | | | | | | | | Change-Id: I3779fbe3f6409139b3d027f96ad390a174c0ff7f Task-number: QTCREATORBUG-6903 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-08-042-0/+4
|\ \ | |/ | | | | Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
| * CMake: Initialize kit priorityOrgad Shaneh2015-08-031-0/+1
| | | | | | | | | | | | | | Detected by memcheck Change-Id: I27bb03ce4b4b63ae596bd3a788b6a95cd0944454 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
| * Fix i18n problemsSergey Belyashov2015-07-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | In the QmlEngine, a few tr() have been replaced by QCoreApplication::translate(). In other files, Q_OBJECT has been added to the class definitions. Change-Id: Ia0505c19934dc691cd3d67f4946293290c2fec68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
| * Cmake: Fix autodetection of cmake on WindowsDaniel Teske2015-07-211-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | By using some of the infrastructure in Utils::Environment. Due to wanting to find all cmake executables in PATH and not just the first one, we need some custom code. (cherry picked from commit ca8b43f6c864ca18ca7da78f1dff810afa697119) Change-Id: If3161d712b9f6e659450a3d0647f83344e68ba5d Task-number: QTCREATORBUG-14740 Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Project: Improve fromMap() error reporting interfaceDaniel Teske2015-07-282-9/+12
| | | | | | | | | | | | | | | | | | | | Instead of just a bool, return a tristate of: Ok, Error and UserAbort. Also add a out parameter errorMessgge. Change-Id: Icb076de49998e9372839d0631c2776e905e4a0f6 Task-number: QTCREATORBUG-13223 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Cmake: Fix autodetection of cmake on WindowsDaniel Teske2015-07-171-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | By using some of the infrastructure in Utils::Environment. Due to wanting to find all cmake executables in PATH and not just the first one, we need some custom code. Change-Id: If3161d712b9f6e659450a3d0647f83344e68ba5d Task-number: QTCREATORBUG-14740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Fix leaking of CMakeToolsDaniel Teske2015-07-151-0/+1
|/ | | | | | | Change-Id: I36d3d19cbd0bccc3ee74f8aae1622dbed22aa45a Task-number: QTCREATORBUG-14727 Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* {Q,C}makeProjectManager: Adjust tooltip capitalizationhjk2015-07-071-1/+1
| | | | | | | | Follows suit after 3d78ec69bba. Change-Id: I1756e0e50dcf414db9ea3f3b2092f8eeb647ae80 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-06-171-3/+6
|\ | | | | | | Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
| * support Visual Studio 2015Joerg Bornemann2015-06-151-3/+6
| | | | | | | | | | | | Task-number: QTBUG-46344 Change-Id: I49c3e2776e65cc83d40d1f5ab3be1365d17242d1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | CodeBlocks: Take into account file target when explicitly specifiedwonder.mice2015-06-152-5/+19
| | | | | | | | | | Change-Id: I37556ef6c2c7a651709012daa9a84c66cf3af505 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Add override to IDocument hierarchyEike Ziller2015-06-112-9/+9
| | | | | | | | | | Change-Id: I6884f59fe0f06e380254c1f8076dd561d9df4ee3 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | TreeModel: takeItem should return the itemEike Ziller2015-06-101-3/+1
| | | | | | | | | | | | | | | | The usual Qt API for "takeXyz()" methods is to return the item that was "taken". Change-Id: Ie144051801487a301b3f13e2857735b65f58150b Reviewed-by: hjk <hjk@theqtcompany.com>
* | Add override keyword to IEditor & TextEditorWidget implementationsEike Ziller2015-06-092-4/+4
| | | | | | | | | | Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | cmakeprojectmanager: s/Q_DECL_OVERRIDE/override/gTobias Hunger2015-06-034-15/+15
| | | | | | | | | | Change-Id: I9465394a8c128e894e3e758d2494e5e8b50c8b37 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | CMakeRunPage: Fix appending of error messagesDaniel Teske2015-05-181-0/+1
| | | | | | | | | | | | Change-Id: I2b1c54bbe948ca8b3ba5384a2e97e29b2fd878c9 Task-number: QTCREATORBUG-14439 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | CMake: Remove no more used CMakeRunConfiguration::setRunMode functionhjk2015-05-182-6/+0
| | | | | | | | | | Change-Id: I1e618408ba87fa1fbcd3c78498adb83d149d935a Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | CMake: Use TerminalAspect in CMakeRunConfigurationhjk2015-05-122-21/+4
| | | | | | | | | | Change-Id: I293252c2beadc6fc4b4650dbf09127aa5e7898f6 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-05-071-15/+25
|\ \ | |/ | | | | | | | | | | Conflicts: src/libs/extensionsystem/pluginview.cpp Change-Id: I410156c1003d5dc81e915110c6d432bcd71da010
| * CMakeProject: Fix CXX Flags parsing for ninja projectsClaus Steuer2015-04-241-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | For ninja projects the "build.ninja" file is parsed to extract the cxx flags for each target. This file is located in the working directory of the "all" target, however since commit "65c113bc" qtcreator searches in the build directory of the current target. I have restored the search behavior to the previous state and added some code to ensure that the parsed flags really belong to the target Change-Id: I7cc7f6dbd4f12aec698133206da889037131bb13 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | CMake: Use ArgumentsAspect in CMakeRunConfigurationhjk2015-04-302-23/+5
| | | | | | | | | | Change-Id: I30fbfc0bcc5e6c997190c3f1a1c279dab06fdbc0 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Blackberry: Remove blackberry supportTobias Hunger2015-04-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep QNX. A short informal search did not turn up any more blackberry users, even though there is interest in QNX. So this patch removes the platform: We had no contact with the maintainers in months, there are no changes going into the code for about as long. I am not even aware of anybody testing the platform, so any remaining users are probably better of with Qt Creator 3.2 or so where the code was extensively tested. Change-Id: Ibeda6bfd8565599918cfcc08fd01cb5ed8793dc2 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | TreeModel: More API cleanuphjk2015-04-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | - introduce topLevelItemCount (similar to QTreeWidget) - squash untypedTreeLevelItems() - rename removeItems() to clear() - rename removeItem() to takeItem() - rename treeLevelItems<> to itemsAtLevel<> Change-Id: I0f1bb4110f7687b20da3d92e3d943858645a9fa2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | TreeModel: API cleanuphjk2015-04-221-1/+1
| | | | | | | | | | | | | | | | | | - rename index{From->For}Item - rename item{From->For}Index - remove ununsed setColumnCount Change-Id: I1cce9657e476dd1e8ffa9f7cdb2e646fab6884ab Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Tasks: Make the linking of compile output to Tasks more robustDaniel Teske2015-04-212-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking on error messages is supposed to jump to the editor. And "Show Output" on the task is supposed to select the error in the output. The old code just registered the task for the last line of output. This broke for every parser that allowed for error messages that spanned multiple lines. And was obviously also incorrect for tasks that weren't generated due to compile output. Fix both of those issues by giving the IOutputParsers more control on which lines are linked to a task. Task-number: QTCREATORBUG-14136 Change-Id: I095922c9875620dabfb7d406f6b152c8a9b25b62 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | CMakeProjectManager: Support mapping chroot include pathsBenjamin Zeller2015-04-217-8/+62
| | | | | | | | | | | | | | | | | | Provide a way for plugins to map include paths into a build chroot. Plugins can register a path mapper if required, otherwise the paths are not touched. Change-Id: I621982831fa354d6d0f558a6c1dce4e014421f12 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | ProjectManagers: Detect Qt by kit for code-model updateOrgad Shaneh2015-04-211-0/+10
| | | | | | | | | | Change-Id: Idf5f8233e4457bb22437d442732432acf0ce313e Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-04-131-23/+7
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakeproject.cpp Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7
| * CMake: Tweak detecting of right project partDaniel Teske2015-04-101-23/+7
| | | | | | | | | | | | | | | | | | | | Don't consider targets that end in _unittest or _automoc. Also don't read CMakeDirectoryInformation.cmake as that doesn't work with add_subdirectory. Change-Id: If06af60e1637e94cccd32d09fc26c6b87488671b Task-number: QTCREATORBUG-12183 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | DiffEditor: Do not load settings when splitting viewsTobias Hunger2015-04-101-1/+0
| | | | | | | | | | Change-Id: I7fac89714ff9a603af29e19664b091e5e62be22f Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Kits: Not having a CMake executable set is perfectly valid.Eike Ziller2015-03-241-11/+2
| | | | | | | | | | | | | | | | It is the normal situation on Windows & OS X for simple Qt development. Change-Id: I84453ebcc62200bd6c7223a593b5953c20194069 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | CMakeSettings: Do not break most of other settingsEike Ziller2015-03-161-16/+15
| | | | | | | | | | | | | | | | | | | | | | Just do not return early, which then missed a settings->endGroup() call. Fixes a regression introduced by 99e9643dea3871f26c5a09e4a1715ba84c9103e9 Change-Id: I102eb76e3381012cddb73c1132b6443dd2cd592f Task-number: QTCREATORBUG-14139 Task-number: QTCREATORBUG-14140 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-03-111-1/+0
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/coreplugin/coreplugin.cpp Change-Id: I9aa6c61412e2ef4a91efe028296bcc2d075856d7
| * Remove support for !shadowBuildDaniel Teske2015-03-091-1/+0
| | | | | | | | | | | | | | | | In ancient times we needed to support some qt versions that didn't support shadow building. This code has been unused for some versions now, so remove it completely. Change-Id: I311f255d6bfed6841e94c9c383bd9929d0d55520 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
View Lorry Controller Status