forked from qt-creator/qt-creator
Compile after qt5/qtbase commit 75a0c7f9
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed some QRegExp methods to be non-const (they were previously const). This change makes Qt Creator compile again. Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
@@ -88,8 +88,8 @@ QList<CvsLogEntry> parseLogEntries(const QString &o,
|
||||
const QString revisionPrefix = QLatin1String("revision ");
|
||||
const QString statusPrefix = QLatin1String("date: ");
|
||||
const QString commitId = QLatin1String("commitid: ");
|
||||
const QRegExp statusPattern = QRegExp(QLatin1String("^date: ([\\d\\-]+) .*commitid: ([^;]+);$"));
|
||||
const QRegExp revisionPattern = QRegExp(QLatin1String("^revision ([\\d\\.]+)$"));
|
||||
QRegExp statusPattern = QRegExp(QLatin1String("^date: ([\\d\\-]+) .*commitid: ([^;]+);$"));
|
||||
QRegExp revisionPattern = QRegExp(QLatin1String("^revision ([\\d\\.]+)$"));
|
||||
const QChar slash = QLatin1Char('/');
|
||||
Q_ASSERT(statusPattern.isValid() && revisionPattern.isValid());
|
||||
const QString fileSeparator = QLatin1String("=============================================================================");
|
||||
|
||||
Reference in New Issue
Block a user