summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-0937-254/+290
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* CMakeProjectManager: Fix crash on selecting make targetDaniel Teske2014-10-081-1/+1
| | | | | | Task-number: QTCREATORBUG-13129 Change-Id: Ie964e547809ee7626c526a6a3f5741f19b8a2f0f Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* CmakeProject: Don't crash on addKit + cancelDaniel Teske2014-08-011-0/+2
| | | | | | | | | | | | This was introduced by adding the remote linux support for 3.0 in 328a24edee3008a8d6bbbc7f57ac064bcd806d37. If the user cancels the run cmake dialog, no buildconfiguration is created. The adding of kit should then not happen. A target without a buildconfiguration should not happen. Task-number: QTCREATORBUG-12773 Change-Id: Ic43c5cc13f9e114ea24cc97154a6c084125f6318 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* CMakeProject: Make CMakeLists.txt and *.cmake use different mime typesDaniel Teske2014-07-177-4/+11
| | | | | | | | Since we want to treat them differently. Task-number: QTCREATORBUG-12461 Change-Id: Ia72b8045390ceec693fa416f65010a4c4dbecce1 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* CMake: fix capitalization of the "Run CMake..." buttonLeena Miettinen2014-07-171-1/+1
| | | | | Change-Id: I5402d29e6916110934411848542b1776178615e1 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Set parent for options dialog where appropriate.Eike Ziller2014-07-141-1/+2
| | | | | | | | | Otherwise the options dialog might appear behind the current "dialog" (for example the "new" wizards). Also, take ICore::dialogParent as default. Change-Id: I4578e269db5763842a942549a45ec8cdd6b28b5d Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* remove duplicate file from project fileJoerg Bornemann2014-07-111-1/+0
| | | | | | | This fixes the build with qbs 1.3. Change-Id: Ie4cb9cf96ab25fda0033eb80b00b59d03f89b755 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* C++: fix include/framework path handling.Erik Verbruggen2014-07-041-4/+9
| | | | | | | | | | Instead of having two lists of paths, now only one list is used where both include paths and framework paths can be mixed. This reflects the way the compiler is invoked, and retains the (correct) search order. Task-number: QTCREATORBUG-11599 Change-Id: I373953e3e305df5b7a0d10920e12d146584adf9f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Always pass Core::Id by value.Christian Kandeler2014-07-016-16/+16
| | | | | | | | | | | Currently we pass in some places by value, elsewhere by const ref and for some weird reason also by const value in a lot of places. The latter is particularly annoying, as it is also used in interfaces and therefore forces all implementors to do the same, since leaving the "const" off is causing compiler warnings with MSVC. Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803 Reviewed-by: hjk <hjk121@nokiamail.com>
* CMake fix deployment dataNikita Baryshnikov2014-07-011-1/+4
| | | | | | | | Fix potential index out of range assertion in QStringList if contents of QtCreatorDeployment.txt would be unexpected(will not contain ':') Change-Id: Ia6ae282ef450e7c56a512b13da801854caec0dfb Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* IDocument: Make mimeType a value memberhjk2014-07-012-7/+1
| | | | | Change-Id: I2e90ccf0a45ae8d00bcd00ec77fe0d9776f2f119 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Cmake fix warningNikita Baryshnikov2014-06-301-3/+5
| | | | | | | | QTextStream: No device Change-Id: I059f163d82bea0719b9781d0e20c691606047326 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* TextEditor: Simplify HighlighterFactory hierarchyhjk2014-06-265-102/+9
| | | | | | Change-Id: I555639a9137dcb8ccb471e1615823870c8158b3c Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Unify "missing compiler" and "missing build configuration" tasksTobias Hunger2014-06-231-11/+5
| | | | | | | | | | Everybody used to do their own thing... Also unify the "Configuration is faulty" message we write into the Application output window. Change-Id: I0e5c4ec68155d66aa1d0ea53134b98917869e5c6 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Reinvent deprecated qSort as Utils::sortNikita Baryshnikov2014-06-191-2/+3
| | | | | | | Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* CMake: Load context-sensitive help.Stephen Kelly2014-06-172-0/+44
| | | | | | | | | | | | | | CMake 3 uses reStructuredText and Sphinx for documentation. Those tools can generate Qt qch files, which makes it possible to load the documentation in QtCreator and to enable context-sensitive help when editing a cmake language file. Add a simple parser to process commands. This may be extended in the future to process variables and properties too. Change-Id: Ic5a49a9ce828ad9a9e8ff4805b48302ee73bcc71 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
* Allow the user to restrict rc creation to certain .proDaniel Teske2014-06-162-2/+3
| | | | | | Task-number: QTCREATORBUG-10953 Change-Id: Iff1a31c007ac777bfa390d48237480ef56ffc0e4 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* CMake: Pass some values by referenceOrgad Shaneh2014-06-021-1/+1
| | | | | Change-Id: Ie232a4312a783f41cb719e6a69cd2e3006caf84c Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* CMake: Remove statement that has no effectOrgad Shaneh2014-06-021-1/+0
| | | | | Change-Id: I3e1494165a77ea76c83d45f2bb08f2a87cd68436 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorer: Get rid of LocalApplicationRunConfiguration::RunModeOrgad Shaneh2014-05-282-10/+11
| | | | | Change-Id: I132eb2615842ad7fdf6d7fa0f87d8c2c0c77203e Reviewed-by: hjk <hjk121@nokiamail.com>
* De-noise RunConfigurationsOrgad Shaneh2014-05-281-28/+25
| | | | | Change-Id: I9def38768c0243358022f56bba80af2080ac8d05 Reviewed-by: hjk <hjk121@nokiamail.com>
* IEditor: Make duplicatesSupported a value memberhjk2014-05-212-1/+1
| | | | | Change-Id: Iee75dd4155d5074bb319df79d006b6d5e2989e14 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-161-1/+4
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/clangcodemodel/test/clangcompletion_test.cpp src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp src/plugins/projectexplorer/projectexplorer.pro src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp src/plugins/vcsbase/vcsplugin.cpp src/shared/qbs Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
| * CMake: Provide generators for Qnx/BB kitsEl Mehdi Fekari2014-05-091-1/+4
| | | | | | | | | | | | Task-number: QTCREATORBUG-12210 Change-Id: Ie7cd3e9f95b823d166ad83018ec3199068132e5e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | DocumentModel: Make interface statichjk2014-05-131-1/+1
| | | | | | | | | | | | | | Move item model implementation to private, adjust user code. Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Project: Use Utils::FileName as return type for projectDirectory(...)Tobias Hunger2014-05-064-11/+11
| | | | | | | | | | Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Project: Use Utils::FileName as return type for projectFilePath()Tobias Hunger2014-05-063-7/+6
| | | | | | | | | | Change-Id: If304d5e95cd9ac714100abaae35d60e3e1050eb2 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | CMake: Show a error if the cached generator is incompatibleDaniel Teske2014-05-062-0/+13
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-8594 Change-Id: I20b2ed5b82f5003315e6f72346a11980ce0929ef Reviewed-by: Matt McLin <matt.mclin@barco.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | ProjectNodes: Refactor runConfigurationsFor()hjk2014-04-292-7/+0
| | | | | | | | | | | | | | | | | | Rename to runConfigurations() and remove the node argument which is available as 'this'. Adjust const-ness of node argument in RunConfigurationFactory::runConfigurationsForNode Change-Id: Icb63e96a305152f90135a2656536de2581faafaf Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-221-1/+1
| | | | | | | | | | Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | CMakeProjectManager: Remove outdated commentDaniel Teske2014-04-171-6/+0
| | | | | | | | | | | | | | There are no plans to create our own generator anymore. Change-Id: I1e74f6ed90ccffbc3837574637ba42c40f375118 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | CMake: Fix build warningTobias Hunger2014-04-111-1/+0
| | | | | | | | | | Change-Id: I934622c2cf993255d92550731a2cd186943d697b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | CMakeProject: Fix useNinja handling in MakeStepDaniel Teske2014-04-072-15/+14
| | | | | | | | | | | | | | | | | | | | | | m_useNinja is now only used to store the value at init() time, thus it's only use is to know while running, whether ninja is in use. Otherwise whether ninja is used or not, is stored in the buildconfiguration. Change-Id: Icda933807ac2f8e5fad32fd124a37bb694bf6e97 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | CMake: MakeStep consistently check that we have a buildconfigurationDaniel Teske2014-04-071-1/+10
| | | | | | | | | | | | | | | | Technically the user can only get into a no buildconfiguration state with broken settings. But we should either check everywhere or nowhere. Change-Id: Ibdc831b66e6cf141c8d25bafed7e568e3cff2ab1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | CMake: MakeStep: Simplfy codeDaniel Teske2014-04-042-18/+5
| | | | | | | | | | Change-Id: I4de1ceecc1f0602d0c58ee3e411d43b15437dffb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-04-021-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/qtsupport/qtversionmanager.cpp src/shared/qbs Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
| * CMakeProjectManager: Ensure that toolchain paths are lastDaniel Teske2014-04-011-5/+5
| | | | | | | | | | | | Task-number: QTCREATORBUG-3959 Change-Id: I93a19af8309933a51d26f94980088c0f244cc84f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-276-16/+23
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
| * CMake: Fix GeneratorInfo to include Msvc2013 everywhereDaniel Teske2014-03-271-2/+4
| | | | | | | | | | Change-Id: I8192d194ac20d8082ebf1cc034e8b84e25e66d90 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
| * CMake: Offer Nmake generator for VS 2013Daniel Teske2014-03-271-1/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-11855 Change-Id: Ieba3c61d292831662184517c55f081792e2381bb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * CMakeOpenProjectWizard: Set a parentDaniel Teske2014-03-265-13/+17
| | | | | | | | | | | | Task-number: QTCREATORBUG-11856 Change-Id: Ie80352683e2a8276f70191db2a3b333275e2648f Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-185-5/+5
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qbs/imports/QtcTool.qbs src/plugins/git/giteditor.cpp src/plugins/qmldesigner/qmldesignerplugin.cpp Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
| * ProjectTree: Change hasBuildTargets to FolderNode::showInSimpleTreeDaniel Teske2014-03-182-2/+2
| | | | | | | | | | | | | | | | So that the resource node can override it. Task-number: QTCREATORBUG-11678 Change-Id: Id30d1b99ee23cc18fc29fc99cf0ad7ca919ed527 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * Fix tooltips, add lacking dotsJarek Kobus2014-03-131-1/+1
| | | | | | | | | | Change-Id: Id54a11b6868d5033fd1ecfd6324b7e50b94e305c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | | | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * CMakeBuildConfiguration: Fix cloning buildconfigurations resetting ninjaDaniel Teske2014-03-111-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-11632 Change-Id: Ie07e257dea4bfa1991a9fd492df3adc756cdb36d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | cmakeprojectmanager: Rename CMakeValidator to CMakeToolBenjamin Zeller2014-03-145-48/+52
| | | | | | | | | | | | | | | | Renamed CMakeValidator to CMakeTool and renamed files to prepare for further refactoring Change-Id: Id6e64e3a39ec36ca3aa8b08bf859ae1345f1a137 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | cmakeprojectmanager: Move SettingsPage and GeneratorInfo in extra filesBenjamin Zeller2014-03-128-329/+501
| | | | | | | | | | | | | | | | | | Move CMakeSettingsPage and GeneratorInfo into extra files to prepare for refactoring Change-Id: Idee2e9f807a961c0eee9c15198ee0966ecc16e83 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-111-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: README tests/auto/debugger/tst_dumpers.cpp Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
| * Fix some typosSergio Ahumada2014-03-051-1/+1
| | | | | | | | | | | | Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
View Lorry Controller Status