diff options
| author | hjk <qtc-committer@nokia.com> | 2011-11-22 15:50:49 +0100 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2011-11-22 15:51:41 +0100 |
| commit | fa66a540fd32647148fb55fb1197e8a49cdfc718 (patch) | |
| tree | 567f140d150e605ba144671c864fb564bc47b3ab /src/plugins/cvs/cvseditor.cpp | |
| parent | 09f56a5c0d1b0bfb92f273e2ae250a640fc71ffc (diff) | |
| download | qt-creator-fa66a540fd32647148fb55fb1197e8a49cdfc718.tar.gz | |
fix C++11 string literal incompatibility
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/cvs/cvseditor.cpp')
| -rw-r--r-- | src/plugins/cvs/cvseditor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp index f0292a15d4..5c94bff43e 100644 --- a/src/plugins/cvs/cvseditor.cpp +++ b/src/plugins/cvs/cvseditor.cpp @@ -48,13 +48,13 @@ namespace Internal { // Match a CVS revision ("1.1.1.1") #define CVS_REVISION_PATTERN "[\\d\\.]+" -#define CVS_REVISION_AT_START_PATTERN "^("CVS_REVISION_PATTERN") " +#define CVS_REVISION_AT_START_PATTERN "^(" CVS_REVISION_PATTERN ") " CVSEditor::CVSEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent) : VCSBase::VCSBaseEditorWidget(type, parent), m_revisionAnnotationPattern(QLatin1String(CVS_REVISION_AT_START_PATTERN".*$")), - m_revisionLogPattern(QLatin1String("^revision *("CVS_REVISION_PATTERN")$")) + m_revisionLogPattern(QLatin1String("^revision *(" CVS_REVISION_PATTERN ")$")) { QTC_ASSERT(m_revisionAnnotationPattern.isValid(), return); QTC_ASSERT(m_revisionLogPattern.isValid(), return); @@ -72,7 +72,7 @@ QSet<QString> CVSEditor::annotationChanges() const QTC_ASSERT(r.isValid(), return changes); if (r.indexIn(txt) != -1) { changes.insert(r.cap(1)); - r.setPattern(QLatin1String("\n("CVS_REVISION_PATTERN") ")); + r.setPattern(QLatin1String("\n(" CVS_REVISION_PATTERN ") ")); QTC_ASSERT(r.isValid(), return changes); int pos = 0; while ((pos = r.indexIn(txt, pos)) != -1) { |