hjk 
							
						 
					 
					
						
						
							
						
						39a38d5679 
					 
					
						
						
							
							Wholesale conversion to #pragma once  
						
						 
						
						... 
						
						
						
						Kudos to cgmb and https://github.com/cgmb/guardonce 
Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com > 
						
						
					 
					
						2016-03-30 15:20:19 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						397e7f4843 
					 
					
						
						
							
							Update License according to agreement with Free Qt Foundation  
						
						 
						
						... 
						
						
						
						* Update files in src/plugins
Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com > 
						
						
					 
					
						2016-01-19 15:57:01 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marco Bubke 
							
						 
					 
					
						
						
							
						
						1ae509541c 
					 
					
						
						
							
							CppTools: Moving ProjectPartBuilder in its own header  
						
						 
						
						... 
						
						
						
						Change-Id: I0aa65ec6c80dcd437f13ff70021388b0da57ccfd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com > 
						
						
					 
					
						2016-01-13 14:47:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marco Bubke 
							
						 
					 
					
						
						
							
						
						2b4cadf1fe 
					 
					
						
						
							
							CppTools: Move ProjectPart in its own header file  
						
						 
						
						... 
						
						
						
						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 > 
						
						
					 
					
						2016-01-13 14:46:56 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						fb80206f3c 
					 
					
						
						
							
							Clean exported headers of the CppTools plugin.  
						
						 
						
						... 
						
						
						
						Change-Id: I0144ac33e88980c431c54a6d69bbde28da4b1967
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2015-03-05 08:16:48 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						38b183fd90 
					 
					
						
						
							
							MimeDatabase: Remove bestMatch, which was broken beyond repair  
						
						 
						
						... 
						
						
						
						The problem is that, if you check e.g. a .pro file against all C/C++ mime
types, and these define magic matchers, it would find that .pro doesn't
match C/C++ mime types by extension, so it would open the file to find a
magic match. Even though the extension .pro would identify it already as
a qmake .pro file when checking for the mime type globally.
Change-Id: I3341187e88e2263bf38169c3c99e5d2161e2a9ee
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com >
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2015-02-27 16:02:25 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						5a3a940ad3 
					 
					
						
						
							
							Use new mime database  
						
						 
						
						... 
						
						
						
						Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com > 
						
						
					 
					
						2015-02-17 13:00:07 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						9926fc2ab1 
					 
					
						
						
							
							Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'  
						
						 
						
						... 
						
						
						
						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 
						
						
					 
					
						2015-02-12 17:29:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikolai Kosjar 
							
						 
					 
					
						
						
							
						
						478914a9ce 
					 
					
						
						
							
							CppTools: Unexport ProjectFileAdder  
						
						 
						
						... 
						
						
						
						Change-Id: Icf53019b594a5c45b06f7f1fab0f4bf36e891918
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2015-02-09 16:08:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						3c85058694 
					 
					
						
						
							
							Update License  
						
						 
						
						... 
						
						
						
						Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com > 
						
						
					 
					
						2015-01-16 12:37:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						8295b503be 
					 
					
						
						
							
							License update  
						
						 
						
						... 
						
						
						
						Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com > 
						
						
					 
					
						2014-10-09 11:41:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						746c5d8863 
					 
					
						
						
							
							Incremented year in copyright info  
						
						 
						
						... 
						
						
						
						Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com > 
						
						
					 
					
						2014-01-08 08:29:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sergey Shambir 
							
						 
					 
					
						
						
							
						
						0609333e02 
					 
					
						
						
							
							CppTools: moved some logic to ProjectFile  
						
						 
						
						... 
						
						
						
						Simplifies code and makes it independent from mimetype names.
Change-Id: Ib56a07654df4986b1916c517e3862e6c3a3dd720
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com > 
						
						
					 
					
						2013-04-10 11:07:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						4b0bafd615 
					 
					
						
						
							
							Clean headers in CppTools.  
						
						 
						
						... 
						
						
						
						Ran script to remove inludes on a trial-and-error basis and
manually corrected it.
Change-Id: Ic8464ea084ca1ab401e9f4a7d0183b92b4038902
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com > 
						
						
					 
					
						2013-04-10 10:55:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						ea23948efb 
					 
					
						
						
							
							CppTools: Use namespace CppTools consistently  
						
						 
						
						... 
						
						
						
						There were quite a few classes using CPlusPlus namespace in the
CppTools plugin. Rename them and do some other small namespace
related coding style fixups.
Change-Id: I093fc1f3fc394fd9923e3f18d5f66522e288f21d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com > 
						
						
					 
					
						2013-04-08 13:21:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						7923032022 
					 
					
						
						
							
							fix include style relating to cplusplus libraries  
						
						 
						
						... 
						
						
						
						... and adjust INCLUDEPATH accordingly.
while i'm at messing with include statements, also re-order the include
blocks according to policy and sort them within bigger blocks.
Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2013-04-03 13:40:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kandeler 
							
						 
					 
					
						
						
							
						
						423ff9b37a 
					 
					
						
						
							
							CppTools: Fix build with namespaced Qt.  
						
						 
						
						... 
						
						
						
						Change-Id: Idec32131c20b91c3d08ac16fbcc1c14ee5ede450
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com > 
						
						
					 
					
						2013-03-25 14:22:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sergey Shambir 
							
						 
					 
					
						
						
							
						
						63fe568b9b 
					 
					
						
						
							
							CppTools: improved languages support in ProjectPart  
						
						 
						
						... 
						
						
						
						Please, read blueprint here:
http://qt-project.org/wiki/Blueprint-for-language-specs-system 
Removed feature from QbsProjectManager: it not longer splits project on
separate C and C++ parts, because Qt version used only by clang parser
(not native) and can be ignored for pure C and Objective-C without C++.
Change-Id: I1c561f7f9f915cc6cb8579d19db74e8352f54c1e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
Reviewed-by: Daniel Teske <daniel.teske@digia.com > 
						
						
					 
					
						2013-03-21 17:22:18 +01:00