Eike Ziller 428fcb476b Merge remote-tracking branch 'origin/4.6' ...

Conflicts:
	src/libs/utils/settingsaccessor.cpp
	src/plugins/autotest/autotestplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.h

Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f

2018-04-13 10:54:42 +02:00

..

gerrit

Utils: Purge asConst

2018-04-09 09:04:00 +00:00

images

Git: Replace CloneWizard with a Json wizard

2015-05-18 13:43:39 +00:00

annotationhighlighter.cpp

Git: De-noise

2016-07-22 10:12:59 +00:00

annotationhighlighter.h

Git: De-noise

2016-07-22 10:12:59 +00:00

branchadddialog.cpp

Git: Factor out pattern for invalid branch names

2017-03-09 08:55:08 +00:00

branchadddialog.h

Git BranchAddDialog: small fixes

2016-07-20 19:48:25 +00:00

branchadddialog.ui

Add spacer between widget and dialogbox button

2017-02-21 08:58:49 +00:00

branchcheckoutdialog.cpp

Update License according to agreement with Free Qt Foundation

2016-01-19 15:57:01 +00:00

branchcheckoutdialog.h

Git: Modernize

2016-02-10 15:01:57 +00:00

branchcheckoutdialog.ui

UI files: Fix tab order in lots of UI forms

2016-08-02 14:29:27 +00:00

branchdialog.cpp

Utils: Purge asConst

2018-04-09 09:04:00 +00:00

branchdialog.h

Git: Extract BranchUtils for re-use in Branches Side Panel

2018-03-01 21:20:42 +00:00

branchdialog.ui

Git: Move "Include tags" to branches dialog

2017-06-29 15:51:23 +00:00

branchmodel.cpp

Utils: Purge asConst

2018-04-09 09:04:00 +00:00

branchmodel.h

Git: Show date and time for newly created branches

2016-06-23 13:05:23 +00:00

branchutils.cpp

Utils: Purge asConst

2018-04-09 09:04:00 +00:00

branchutils.h

Git: Extract BranchUtils for re-use in Branches Side Panel

2018-03-01 21:20:42 +00:00

changeselectiondialog.cpp

Git: Show decorations in commit details

2018-03-07 13:42:20 +00:00

changeselectiondialog.h

Git: clean forward declaration

2017-09-28 07:05:19 +00:00

changeselectiondialog.ui

Git: Use PathChooser for Actions on Commits

2016-02-04 12:57:33 +00:00

commitdata.cpp

Git: Eradicate Q_FOREACH loops

2017-02-06 09:37:44 +00:00

commitdata.h

Git: Add Sign off feature in git commit view

2017-01-05 08:17:33 +00:00

git_dependencies.pri

Qbs/qmake: Fix dependencies of plugins

2014-02-11 13:23:26 +01:00

Git.json.in

Git: show commit given as command line parameter in diff editor

2018-03-16 09:45:45 +00:00

git.pro

Git: Extract BranchUtils for re-use in Branches Side Panel

2018-03-01 21:20:42 +00:00

git.qbs

Git: Extract BranchUtils for re-use in Branches Side Panel

2018-03-01 21:20:42 +00:00

git.qrc

Move mimetype definitions to plugin specs

2017-02-27 13:54:59 +00:00

gitclient.cpp

Merge remote-tracking branch 'origin/4.6'

2018-04-13 10:54:42 +02:00

gitclient.h

Move git specific stuff out of diff editor plugin

2018-03-15 11:21:01 +00:00

gitconstants.h

Move git specific stuff out of diff editor plugin

2018-03-15 11:21:01 +00:00

giteditor.cpp

Remove spaces in initializer lists

2017-02-22 16:25:09 +00:00

giteditor.h

Git: clean forward declaration

2017-09-28 07:05:19 +00:00

gitgrep.cpp

Utils: Purge asConst

2018-04-09 09:04:00 +00:00

gitgrep.h

Vcs/Text search: Remove a few addAutoReleaseObject uses

2018-02-06 11:58:15 +00:00

githighlighters.cpp

Utils: Purge asConst

2018-04-09 09:04:00 +00:00

githighlighters.h

Simplify text format handling in syntax highlighters

2017-05-23 07:47:22 +00:00

gitplugin.cpp

Utils: Purge asConst

2018-04-09 09:04:00 +00:00

gitplugin.h

Git: show commit given as command line parameter in diff editor

2018-03-16 09:45:45 +00:00

gitsettings.cpp

Git: Remove unused setting

2017-06-25 18:17:08 +00:00

gitsettings.h

Git: Remove unused setting

2017-06-25 18:17:08 +00:00

gitsubmiteditor.cpp

Git: Eradicate Q_FOREACH loops

2017-02-06 09:37:44 +00:00

gitsubmiteditor.h

Git: clean forward declaration

2017-09-28 07:05:19 +00:00

gitsubmiteditorwidget.cpp

Git: Add Sign off feature in git commit view

2017-01-05 08:17:33 +00:00

gitsubmiteditorwidget.h

Git: Modernize

2016-02-10 15:01:57 +00:00

gitsubmitpanel.ui

Git: Remove "Sign off" shortcut from submit editor

2017-03-23 12:36:35 +00:00

gitutils.cpp

Git: De-noise

2016-07-22 10:12:59 +00:00

gitutils.h

Git: Modernize

2016-02-10 15:01:57 +00:00

gitversioncontrol.cpp

Remove spaces in initializer lists

2017-02-22 16:25:09 +00:00

gitversioncontrol.h

VCS: Add a way to filter out files/directories that belong to a VCS

2016-10-21 13:04:40 +00:00

logchangedialog.cpp

Git: Eradicate Q_FOREACH loops

2017-02-06 09:37:44 +00:00

logchangedialog.h

Git: Use Utils::Icon for IconItemDelegate constructor

2016-10-11 13:29:30 +00:00

mergetool.cpp

Git: Use C locale when parsing the command output

2017-10-12 18:52:58 +00:00

mergetool.h

Git: clean forward declaration

2017-09-28 07:05:19 +00:00

remoteadditiondialog.ui

Git: Add input validation to RemoteAdditionDialog

2017-03-09 22:03:05 +00:00

remotedialog.cpp

VCS: Fix translation issues

2017-10-24 08:12:11 +00:00

remotedialog.h

Git: Do not reuse RemoteAdditionDialog

2017-03-04 20:44:15 +00:00

remotedialog.ui

Git: Remotedialog, replace QTableView with QTreeView

2014-06-20 15:41:07 +02:00

remotemodel.cpp

Git: Refresh RemoteModel when last remote was removed

2017-09-14 10:44:43 +00:00

remotemodel.h

Git: clean forward declaration

2017-09-28 07:05:19 +00:00

settingspage.cpp

Vcs/Text search: Remove a few addAutoReleaseObject uses

2018-02-06 11:58:15 +00:00

settingspage.h

Vcs/Text search: Remove a few addAutoReleaseObject uses

2018-02-06 11:58:15 +00:00

settingspage.ui

Git: Move "Include tags" to branches dialog

2017-06-29 15:51:23 +00:00

stashdialog.cpp

Git: Eradicate Q_FOREACH loops

2017-02-06 09:37:44 +00:00

stashdialog.h

Git: clean forward declaration

2017-09-28 07:05:19 +00:00

stashdialog.ui

Git: Fix keyboard activation in StashView

2014-04-14 12:08:16 +02:00

TODO.txt

Git: Update TODO file

2013-02-27 15:27:27 +01:00