Nikolai Kosjar 
							
						 
					 
					
						
						
							
						
						bfa07e3ccc 
					 
					
						
						
							
							VCS: Fix build  
						
						 
						
						... 
						
						
						
						Change-Id: Ie18986306317b72558b3c59021bfa921fd2fcd5b
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2017-09-12 10:41:17 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						21ab4c427c 
					 
					
						
						
							
							VCS: Offer to save-all before commit  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-3857
Change-Id: I3ff3d90803eec4134b9da4af5567753ad7bffafb
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2017-09-12 10:04:20 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						19c9194b11 
					 
					
						
						
							
							VcsManager: Register IVersionControls with VcsManager  
						
						 
						
						... 
						
						
						
						Get some more objects out of the pool.
Change-Id: Id93021b712307c4777dc39b9d15aa18a46318885
Reviewed-by: Eike Ziller <eike.ziller@qt.io > 
						
						
					 
					
						2017-07-10 08:44:47 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						5832f52cee 
					 
					
						
						
							
							VCS: Replace describe slots with lambdas  
						
						 
						
						... 
						
						
						
						Change-Id: I05ca25aad8be43fdfa15d3fb5eaaa9bf753ee79f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io > 
						
						
					 
					
						2016-11-28 09:38:12 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						74849134f4 
					 
					
						
						
							
							Bazaar: Modernize  
						
						 
						
						... 
						
						
						
						* Use pragma once
* Remove unused member variables
* Use overrides
Change-Id: I190262143e6a51cf6882aceab64e8461202c74a3
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2016-02-04 10:45:13 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						3f6f02f2f1 
					 
					
						
						
							
							Bazaar: Replace CloneWizard with a Json wizard  
						
						 
						
						... 
						
						
						
						Change-Id: Ifce4d43a2f8d1ec97af4b30d32e5c8bb03c22bc9
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr > 
						
						
					 
					
						2015-05-18 12:43:12 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						73a7732850 
					 
					
						
						
							
							Vcs: Unify options pages for VcsBaseClientImpl based VCSes  
						
						 
						
						... 
						
						
						
						Change-Id: Ia5dd7746f5857e7254251e3510c0987737cfad6d
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2015-04-09 07:25:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						90ce38da39 
					 
					
						
						
							
							Vcs: Move handling of settings from VcsBaseClient to VcsBaseClientImpl  
						
						 
						
						... 
						
						
						
						... and update users of that functionality accordingly.
Unexpected plus: Now every supported VCS actually saves their setting
when requested.
Change-Id: I02db7b2ce14e5f52d26409b2a01aea290c2a294a
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2015-04-08 09:30:44 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						9a1c382273 
					 
					
						
						
							
							VCS: Remove dead stores  
						
						 
						
						... 
						
						
						
						Change-Id: I998e523c76bdc0b76cbc6089092a0dda4812ca16
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com >
Reviewed-by: André Hartmann <aha_1980@gmx.de > 
						
						
					 
					
						2015-03-08 08:20:28 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugues Delorme 
							
						 
					 
					
						
						
							
						
						a0f8a67d7a 
					 
					
						
						
							
							Bzr: use Qt5 connects in BazaarPlugin  
						
						 
						
						... 
						
						
						
						Change-Id: Iaa264abd266cdbaa34212f5d3faca21f855c6bbb
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2015-03-06 08:05:25 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugues Delorme 
							
						 
					 
					
						
						
							
						
						f7bdbc66e0 
					 
					
						
						
							
							Vcs: rename overload SubmitEditor::diffSelectedFiles() for rows  
						
						 
						
						... 
						
						
						
						-> Renamed to diffSelectedRows()
This allows to use easily Qt5 connects, without ugly casting to
pick the right overload
Change-Id: Ifaa0242febccb4e1aadd53470cc4b3be79b07c18
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
(cherry picked from commit 12fac12e8f ) 
						
						
					 
					
						2015-03-06 08:02:35 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						54da18eaaa 
					 
					
						
						
							
							Clean exported headers of the Core plugin.  
						
						 
						
						... 
						
						
						
						Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2015-03-05 07:18:14 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						aee35662a2 
					 
					
						
						
							
							Prefix duplicate names in Open Documents to make them unique  
						
						 
						
						... 
						
						
						
						If a document has a file name associated with it then the prefix is
composed from path components (subdirectories), starting from the one
where the file is located and going up the parents until the resulting
name becomes unique among other open documents.
If a document doesn't have an associated file name, then a sequential
number (starting from 1) is appended to the display name of the
document.
This feature is useful when working with big projects that have lots
of idendical file names across different subdirectories (e.g.
Makefile.in, main.cpp, etc.) that need to be edited at the same
time. It allows to easily recognize such a file when switching
between documents in the editor, w/o the need to place the
mouse pointer over the name entry to get its full path.
Started-by: Dmitriy Kuminov <coding@dmik.org >
Task-number: QTCREATORBUG-10185
Change-Id: I633ea6d9b9b4fce8b67335dbcce1bda29254efde
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com > 
						
						
					 
					
						2015-02-26 14:56:25 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						620d1c36e5 
					 
					
						
						
							
							VCS: Remove unneeded qualifications  
						
						 
						
						... 
						
						
						
						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: I061c7bdcade96961aed226a8348f8ab07ee95f5f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com > 
						
						
					 
					
						2015-02-04 13:22:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						d2da1a94ff 
					 
					
						
						
							
							Bazaar: Sprinkle with auto  
						
						 
						
						... 
						
						
						
						Change-Id: Ie87de7eeeba6988870c8c35eab67be576f4e60a5
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2015-01-22 14:18:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugues Delorme 
							
						 
					 
					
						
						
							
						
						718dd00fad 
					 
					
						
						
							
							Bzr: fix regression, commit was broken !  
						
						 
						
						... 
						
						
						
						The error-prone QObject::connect(SIGNAL(), SLOT()) caused the commit to not happen.
Status parsing was not triggered anymore.
Change-Id: Id413fb1a22de062b6d0a433f41603a84d89243c5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com > 
						
						
					 
					
						2015-01-19 22:49:27 +01: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						c6a983d271 
					 
					
						
						
							
							Core: Use FileName for file path in IDocument  
						
						 
						
						... 
						
						
						
						Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com > 
						
						
					 
					
						2015-01-12 10:23:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						a4b4728267 
					 
					
						
						
							
							VCS: Rework disabling of ambiguous actions  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-13364
Change-Id: Ib9dc98964983f1a2808a89d90969089a09d2b55e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com > 
						
						
					 
					
						2014-11-17 10:57:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						ea27143239 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/3.2'  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h
Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f 
						
						
					 
					
						2014-10-14 15:36:16 +02: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						7224ccb2e7 
					 
					
						
						
							
							Editors: Automatically add editor/document id to context and use that  
						
						 
						
						... 
						
						
						
						instead of manually adding a context everywhere.
Change-Id: I4336015a6d19349171a255e949da89b0013d6700
Reviewed-by: hjk <hjk121@nokiamail.com > 
						
						
					 
					
						2014-09-02 16:48:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						9c152fce7e 
					 
					
						
						
							
							Vcs: Collapse VcsSubmitEditorFactory hierarchy  
						
						 
						
						... 
						
						
						
						Same pattern as for VcsSubmitFactory.
Change-Id: I7adb8868a83842c1b6c642db372a3624dd2e879e
Reviewed-by: Christian Stenger <christian.stenger@digia.com > 
						
						
					 
					
						2014-09-01 10:41:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						59259df569 
					 
					
						
						
							
							Vcs: Convert to new editor construction scheme  
						
						 
						
						... 
						
						
						
						Change-Id: I4b4516c8cdf1a934a7865ac6dce904a244995b5b
Reviewed-by: Christian Stenger <christian.stenger@digia.com > 
						
						
					 
					
						2014-08-28 17:02:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						4d082cee74 
					 
					
						
						
							
							VcsBase: Use static pattern for VcsBaseOutputWindow  
						
						 
						
						... 
						
						
						
						Also rename to VcsOutputWindow.
Change-Id: I79547b1154603a8c7b3604eadc5b460930c6109c
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: hjk <hjk121@nokiamail.com > 
						
						
					 
					
						2014-08-27 12:12:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						aa6495a261 
					 
					
						
						
							
							ExtensionSystem: Remove Qt4 support  
						
						 
						
						... 
						
						
						
						Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5.
Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47
Reviewed-by: hjk <hjk121@nokiamail.com >
Reviewed-by: Christian Stenger <christian.stenger@digia.com > 
						
						
					 
					
						2014-08-27 08:44:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						b5a1599776 
					 
					
						
						
							
							Vcs*: Rename several *Editors to *EditorWidgets  
						
						 
						
						... 
						
						
						
						Follow suit.
Change-Id: If22452a5e46d62d419ba273981b1f247f5095b53
Reviewed-by: Christian Stenger <christian.stenger@digia.com > 
						
						
					 
					
						2014-08-22 11:24:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						6772ba622a 
					 
					
						
						
							
							Fix closing editor with ctrl+w or "x" or File > Close  
						
						 
						
						... 
						
						
						
						If there are other editors on the document visible in some split, it
should not close the document, but only the editor.
Task-number: QTCREATORBUG-9346
Change-Id: Idce1ae2f518d4c6e875d86f9831d41c46c06361c
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2014-08-22 08:54:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						2481e71d18 
					 
					
						
						
							
							Vcs: Move editor construction over to new scheme  
						
						 
						
						... 
						
						
						
						Change-Id: I491b9f37bfe15ebc800fedd5c683bfaf24e63889
Reviewed-by: Christian Stenger <christian.stenger@digia.com > 
						
						
					 
					
						2014-08-21 11:50:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						351abd035b 
					 
					
						
						
							
							Vcs: Flatten the VcsBase::BaseCheckoutWizard hierarchy  
						
						 
						
						... 
						
						
						
						Following the new simple-factory pattern
Change-Id: Idceb7a339169af37a040f9da7d36d3fe22dfb347
Reviewed-by: Daniel Teske <daniel.teske@digia.com >
Reviewed-by: hjk <hjk121@nokiamail.com > 
						
						
					 
					
						2014-08-18 17:06:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						264df002e6 
					 
					
						
						
							
							VCS: Make submit editor closing independent from current editor  
						
						 
						
						... 
						
						
						
						The VCS plugins keep a reference to the submit editor, so it can
explicitly be closed, instead of relying on the correct currentEditor in
the editor manager.
Change-Id: I14aab63447f790f2065a8d8dc6b50aeacbd1e941
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2014-08-15 15:33:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						d1a8347e65 
					 
					
						
						
							
							Vcs: Denoise *plugin.cpp and reduces scope of constants  
						
						 
						
						... 
						
						
						
						Change-Id: If2eb34e8975cca46a52c61d902b89a5f99c757a5
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2014-07-28 18:33:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						2bf4d7c3da 
					 
					
						
						
							
							Bazaar: Code style  
						
						 
						
						... 
						
						
						
						Change-Id: I0c2281703d4708bf07702d9d2fc148842489bb04
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2014-07-22 13:57:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						3c7f5c08bd 
					 
					
						
						
							
							Bazaar: Assign parent to dialogs  
						
						 
						
						... 
						
						
						
						Change-Id: I3bbcd289c06932b2031d08e13e5378010acd58a9
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr > 
						
						
					 
					
						2014-06-18 15:40:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						67c2c77a99 
					 
					
						
						
							
							Vcs: Append "Factory" to the variaus checkout wizards  
						
						 
						
						... 
						
						
						
						Change-Id: I571717a389c63f4f0371570e22d3f2a834e8b900
Reviewed-by: Orgad Shaneh <orgads@gmail.com > 
						
						
					 
					
						2014-05-26 11:43:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						4d96fa7aba 
					 
					
						
						
							
							Core: Merge Find and Locator into Core plugin  
						
						 
						
						... 
						
						
						
						Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com >
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2014-01-14 07:43:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						236ea9efb9 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/3.0'  
						
						 
						
						... 
						
						
						
						Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp
Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d 
						
						
					 
					
						2014-01-08 11:01:06 +01: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugues Delorme 
							
						 
					 
					
						
						
							
						
						e922cd234b 
					 
					
						
						
							
							Bzr: add support for "uncommit" command  
						
						 
						
						... 
						
						
						
						All "bzr uncommit" options are supported, even --dry-run (allowing
user to check the green light)
Change-Id: Ib97ef1333709ad18be53c658c23c97356e4e4ce0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com > 
						
						
					 
					
						2013-12-11 15:35:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						b034b0b955 
					 
					
						
						
							
							DVCS: Never prompt before committing  
						
						 
						
						... 
						
						
						
						Commit is local. There's no reason to prompt.
Change-Id: I3aed5ad4931bc49c62d52f906100273739f4af89
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com > 
						
						
					 
					
						2013-10-11 16:40:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						eb724f3772 
					 
					
						
						
							
							EditorManager: Use interface directly instead of going through ICore  
						
						 
						
						... 
						
						
						
						In the majority of cases we were doing that anyways, having two
ways is just needlessly confusing.
Change-Id: Ied362a702c23beee528368d74df1f2aabe5807f8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com > 
						
						
					 
					
						2013-08-30 11:25:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						b0d14c79fe 
					 
					
						
						
							
							VCS: Use correct output style  
						
						 
						
						... 
						
						
						
						Change-Id: I95ea8078ae53e7339213765fbb8a79bff33f899c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com > 
						
						
					 
					
						2013-08-12 12:42:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						113c5600c9 
					 
					
						
						
							
							Move displayName from IEditor to IDocument  
						
						 
						
						... 
						
						
						
						The display name is not editor instance specific, but belongs to the
document.
Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e
Reviewed-by: Daniel Teske <daniel.teske@digia.com > 
						
						
					 
					
						2013-07-10 17:26:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						dd43d9908f 
					 
					
						
						
							
							Rename IDocument::fileName --> filePath  
						
						 
						
						... 
						
						
						
						That is what it actually is, wrt how Qt API calls it.
Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2013-07-09 13:51:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						7c8db79817 
					 
					
						
						
							
							Switch less often to edit mode  
						
						 
						
						... 
						
						
						
						This change
* Removes IMode::type, ModeManager::activateModeType, and
  IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
  instead
* Adapts the mode switching code in EditorManager to handle multiple
  windows, for example switching to edit mode should only happen if
  the editor/view is in the main window. Otherwise the editor window
  should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
  make the current editor visible by default, introducing
  DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
  used
One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.
Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com > 
						
						
					 
					
						2013-06-05 09:43:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						64fe884bbc 
					 
					
						
						
							
							VCS: Fix tests  
						
						 
						
						... 
						
						
						
						Some editors were removed, adapt indices
Change-Id: I87ab8c3aa8c6e9ccad494527ec93a171f90ecf83
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com > 
						
						
					 
					
						2013-05-27 17:45:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						94148f22e9 
					 
					
						
						
							
							VCS: Remove unused editors  
						
						 
						
						... 
						
						
						
						Change-Id: Ia931fdd07d7cf1984f34b10c9b4c20a414c93d9e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com > 
						
						
					 
					
						2013-05-24 12:29:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Orgad Shaneh 
							
						 
					 
					
						
						
							
						
						fd48f081c6 
					 
					
						
						
							
							VCS: Remove unused extension parameter from editors  
						
						 
						
						... 
						
						
						
						Change-Id: I17e73e269698af0d515f668d3c272a748cdca3bb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com > 
						
						
					 
					
						2013-05-24 12:21:26 +02:00