Commit 7eaaab6e authored by Marc Mutz's avatar Marc Mutz Committed by hjk
Browse files

Add spaces between macros and string literals

Commit fa66a540 fixed string literal and macro concatenation
some time ago, but while it changed "literal1"M1"literal2" to
"literal1" M1 "literal2" it didn't touch M"literal". This patch
changes this to M "literal" for consistency.

This patch is the remnant of a cherry-pick of a C++11 compilation
fix equivalent to fa66a540

 from KDAB's branch of QtC 2.4.0.

Change-Id: I87644e888a7e74b18d4b1ca10786cdc3fa798453
Reviewed-by: Nicolas Arnaud-Cormos's avatarNicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 7853297f
This diff is collapsed.
......@@ -53,7 +53,7 @@ namespace Internal {
CvsEditor::CvsEditor(const VcsBase::VcsBaseEditorParameters *type,
QWidget *parent) :
VcsBase::VcsBaseEditorWidget(type, parent),
m_revisionAnnotationPattern(QLatin1String(CVS_REVISION_AT_START_PATTERN".*$")),
m_revisionAnnotationPattern(QLatin1String(CVS_REVISION_AT_START_PATTERN ".*$")),
m_revisionLogPattern(QLatin1String("^revision *(" CVS_REVISION_PATTERN ")$"))
{
QTC_ASSERT(m_revisionAnnotationPattern.isValid(), return);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment