feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	src/plugins/android/androidmanifesteditorwidget.cpp

Change-Id: I8143d9e02837dcd78a637da7b333a6eeebb105cb
This commit is contained in:
Eike Ziller
2020-04-07 11:13:58 +02:00
parent 45e7b78dc3 c98f213ae9
commit 10114dc036
60 changed files with 48689 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/vcsbase/vcsoutputformatter.cpp
View File

@@ -38,7 +38,7 @@ VcsOutputFormatter::VcsOutputFormatter() :
m_regexp(
"(https?://\\S*)" // https://codereview.org/c/1234
"|(v[0-9]+\\.[0-9]+\\.[0-9]+[\\-A-Za-z0-9]*)" // v0.1.2-beta3
"|([0-9a-f]{6,}(?:\\.\\.[0-9a-f]{6,}" // 789acf or 123abc..456cde
"|([0-9a-f]{6,}(?:\\.{2,3}[0-9a-f]{6,}" // 789acf or 123abc..456cde
"|\\^+|~\\d+)?)") // or 789acf^ or 123abc~99
{
}