summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppprojects.cpp
Commit message (Collapse)AuthorAgeFilesLines
* CppTools: Remove cpptools/cppprojects.[h|cpp]Marco Bubke2016-01-131-50/+0
| | | | | Change-Id: Ida0e8552d371972c141cf561b28667f4428c6fff Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* CppTools: Moving CompilerOptionsBuilder in its own header fileMarco Bubke2016-01-131-223/+0
| | | | | Change-Id: I503ffd72a98db6668f6449ce95e695e035a79a29 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* CppTools: Moving ProjectPartBuilder in its own headerMarco Bubke2016-01-131-227/+0
| | | | | Change-Id: I0aa65ec6c80dcd437f13ff70021388b0da57ccfd Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* CppTools: Move ProjectInfo in its own header fileMarco Bubke2016-01-131-115/+0
| | | | | Change-Id: I0fc4c73553a29585d4ff7c8d6593acb6975d1607 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* CppTools: Move ProjectPart in its own header fileMarco Bubke2016-01-131-131/+7
| | | | | | | | Also extracting inline HeaderPath class and change projects list in vector because the size is larger than a pointer. Change-Id: I885fdff3fe9bccc877634d1615249755f5b674fd Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* CppTools: Guard against doubled header pathsNikolai Kosjar2015-11-231-4/+13
| | | | | | Change-Id: If183b6d2210028f74dae839db782114ce79911c4 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
* CppTools: CompilerOptionsBuilder takes project part by referenceNikolai Kosjar2015-11-111-7/+7
| | | | | | | | ...since it assumes a project part != 0 and does not participate in ownership. Change-Id: Ia9c1eca52776990576a2dac61e9144234b04c59c Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-08-041-3/+8
|\ | | | | | | Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
| * CppTools: Update language standard option for clangNikolai Kosjar2015-08-031-2/+4
| | | | | | | | | | | | | | | | Tested with clang 3.6. Change-Id: Icd2383bd03b91837b3129045e9ab78a1620efd02 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
| * CppTools: Ensure that ProjectPart::id() != " "Nikolai Kosjar2015-07-201-1/+4
| | | | | | | | | | Change-Id: Ic928380f711e58008ed66691137c238598a5c26a Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
* | Rename toolchain type constants in ProjectExplorerTobias Hunger2015-07-141-1/+1
| | | | | | | | | | Change-Id: I56f5b7373846bb091456c050eb1ff3495ca2dd72 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | ToolChain: Get rid of type() in favor of typeId()Tobias Hunger2015-07-141-2/+2
|/ | | | | Change-Id: I8fc68c266acb55a7c3e014697a7b526784914f7a Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* CppTools: Re-introduce gcc 4.9 __has_include fixNikolai Kosjar2015-06-291-0/+10
| | | | | | | Now the ClangCodeModel makes also use of this. Change-Id: I3d547dffe48e35d3b3d03063bc1a640283d670c1 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* CppTools: Add toolchain type to project part and use itNikolai Kosjar2015-06-291-65/+55
| | | | | | | | | | Making CompilerOptionsBuilder to use the toolchain from the project part simplifies its public API, but following the code paths initiated by ClangCodeModel and ClangStaticAnalyzer gets harder, so better enable the separation of those by making CompilerOptionsBuilder a base class. Change-Id: I0a6bb3f8323ba09b88135a7f9d1ef967331a8ff0 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* CppTools: Use CompilerOptionsBuilder as an objectNikolai Kosjar2015-06-261-34/+37
| | | | | | | | Makes the client code more readable. Change-Id: Ie98ba93c758643039d3ebdc7550b1c4ac9473298 Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* CppTools: Do not return a language option for ProjectFile::UnclassifiedNikolai Kosjar2015-06-031-1/+5
| | | | | | | This led to an invalid command line ("-x" without further argument). Change-Id: I8cfe1a8a29789fba426b61fe3702496d8089db6b Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
* Toolchains: Add C++98 as a language standard.Christian Kandeler2015-04-141-0/+2
| | | | | | | | | | This was curiously missing from the CompilerFlag enum, so e.g. setting "QMAKE_CXXFLAGS += -std=c++98" in a .pro file did not have the desired effect on higher-level code such as the code model. Change-Id: Ia4323b699a2ccea9d3cbde10b05affe87d955277 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Clean exported headers of the CppTools plugin.Friedemann Kleint2015-03-051-0/+3
| | | | | Change-Id: I0144ac33e88980c431c54a6d69bbde28da4b1967 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* C++: Use correct features for document parsingOrgad Shaneh2015-02-201-0/+24
| | | | | | Task-number: QTCREATORBUG-8007 Change-Id: Ic96aaa433442812a99bac9d16bb9124d66762e8c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | CppTools: Unexport ProjectFileAdderNikolai Kosjar2015-02-091-0/+1
| | | | | | | | | | Change-Id: Icf53019b594a5c45b06f7f1fab0f4bf36e891918 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | C++: Remove unneeded qualificationsOrgad Shaneh2015-02-041-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I6fbe13ddc1485efe95c3156097bf41d90c0febac Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* | CppTools: Remove workaround for quotes in definesNikolai Kosjar2015-02-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...since by now we get the defines in the correct format from QMakeProject. See the change this one depends on. Tested with: Qbs: cpp.defines: [ 'PATH1="/some/path"', "PATH2=\"/some/path\"" ] QMake: DEFINES += PATH1=\\\"/some/path\\\" "PATH2=\\\"/some/path\\\"" CMake: add_definitions(-DPATH1="/some/path" "-DPATH2=\"/some/path\"") All these lines translate to #define PATH1 "/some/path" #define PATH2 "/some/path" for the code model. Change-Id: Ifc3d3acff3abab6897ccbd0c5fafd5c415dfb53c Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | CppTools: Make CompilerOptionsBuilder hide intrinsics.Christian Kandeler2015-02-031-1/+9
| | | | | | | | | | Change-Id: I8b677fc82672ca5fd36bae18480467ef95201dcc Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* | CppTools: Filter out "bad" symbols when collecting compiler defines.Christian Kandeler2015-01-291-0/+9
| | | | | | | | | | | | | | Not all defines make sense for non-compilation purposes. Change-Id: I7c5dd5aaa6de5c8916dfc10eb54ae49efa22959d Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* | CppTools: Fix macro collection.Christian Kandeler2015-01-271-7/+5
| | | | | | | | | | | | | | | | "#define XYZ" does not correspond to "-DXYZ" (which means "#define XYZ 1"), but to "-DXYZ=". Change-Id: I3ed44e1457b3df52dc9bdb930ba8f4a04784d207 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* | CppTools: Support MSVC in CompilerOptionsBuilder.Christian Kandeler2015-01-261-7/+39
| | | | | | | | | | | | | | Needed for clang static analyzer. Change-Id: I0221b7e87f7b52a4aa5ebf7f4b26c19e584d63e7 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.3'Eike Ziller2015-01-081-6/+12
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/cppeditor/cppdocumentationcommenthelper.cpp Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
| * CppTools: Check for valid active targetNikolai Kosjar2015-01-061-6/+12
| | | | | | | | | | | | | | | | | | | | The active target might be 0 if e.g. there are not kits and a project is imported. Task-number: QTCREATORBUG-13730 Change-Id: I48ade507fefc555d1d3f8230ba82c00270fa457b Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | CppTools: Create ProjectInfos explicitlyNikolai Kosjar2014-12-191-9/+0
|/ | | | | | | | | | | ...instead of going through CppModelManager::projectInfo(). Now CppModelManager::projectInfo() returns an invalid ProjectInfo in case there is no valid data for the given Project. Change-Id: I11908bf2ddf865b1d3d71ff176eaf4139292b21c Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* ProjectPartBuild: Fix framework pathsChristian Stenger2014-11-201-1/+0
| | | | | | Task-number: QTCREATORBUG-13137 Change-Id: I71a222a4048db65db462da07726ea5d6b917da8d Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* CppTools: Provide whether a sub project is selected for buildingNikolai Kosjar2014-11-071-0/+1
| | | | | | | Analyzers can use this to rule out irrelevant (sub) projects. Change-Id: I5a9eb66f06156f0619dc639f6f4080a8fc761ee6 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* CppTools: Add API to set/query compiler call dataNikolai Kosjar2014-11-071-0/+41
| | | | | | | ...and make some comparison functions public. Change-Id: If4c9a95031dece32073ce111484a890230190688 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* CppTools: Remove ProjectInfo::operator bool()Nikolai Kosjar2014-11-061-5/+0
| | | | | | | This one does not buy us much... Change-Id: I1d6c4667c038d319d2c16166505a386653a9f066 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* CppTools: Remove un-used functionNikolai Kosjar2014-10-301-6/+1
| | | | | Change-Id: Ib346359487cb06c0fc95ff5796e9dd6f220b9d16 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Move some functions from ClangCodeModel to CppToolsNikolai Kosjar2014-10-201-0/+172
| | | | | | | Most of the functions were quite generic and not specific to clang. Change-Id: I160cfeb7eca5b69ad6a8932a4f76db5bf5c1d42d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* License update.Eike Ziller2014-10-151-7/+8
| | | | | Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* C++: remove C/C++ distinction from ProjectPart fields.Erik Verbruggen2014-09-161-47/+46
| | | | | | | | | | .. because they now hold only files for a single language+extensions combination. Task-number: QTCREATORBUG-11709 Task-number: QTCREATORBUG-12818 Change-Id: If294f6de07d60126be733d98de12b89b8af3efce Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: update project info once after finishing adding all project parts.Erik Verbruggen2014-09-121-24/+25
| | | | | | | | So that recalculating the information is not O(n^2) but linear. Change-Id: I69903e0b5ad321d071804d782ad634a3f300e71a Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: Change QStringList to QSet<QString> to prevent conversions.Erik Verbruggen2014-09-041-4/+2
| | | | | | | | | This eliminates a bunch of list->set->list conversions. Especially the ProjectInfo::appendProjectPart takes lots of time converting for every part added. Change-Id: Ib3c8cd4b0ad6c012ccbeed12ebedd46b9b6cca95 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* C++: introduce the unique ProjectPart::id()Erik Verbruggen2014-08-281-0/+5
| | | | | | | | | And change the code-model inspector dialog to use them in the ProjectParts tab to sync the master/details view, and in the CppPreProcessorDialog to save/reload the selected part. Change-Id: I7cc8ac1c21d31122f8650985d0b85177ebabdfb8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* GenericProject: put different languages into separate project parts.Erik Verbruggen2014-08-211-3/+231
| | | | | | | | This is in preparation for changes to the ProjectParts, where one part can only hold files for 1 language. Change-Id: I5e9a1a803ecc3ecbb36added0d0094df63922549 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* CppTools: Move Project{Part,Info} to new cppprojects.{h,cpp}Nikolai Kosjar2014-08-201-0/+211
Change-Id: Ieff216017b9da1e6a12121688ea9572bdd81fd9b Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
View Lorry Controller Status