diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-04-30 12:01:15 +0200 |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-04-30 14:32:08 +0200 |
| commit | fb9146a9c39b70f84b78c7b75ba7503214fd4296 (patch) | |
| tree | f443c543127146c16553ee4aa300d73a0d81bfd7 /src/libs/cplusplus/CppRewriter.cpp | |
| parent | d681bc10c9977036e02d84c9e3023bd86050abee (diff) | |
| download | qt-creator-fb9146a9c39b70f84b78c7b75ba7503214fd4296.tar.gz | |
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>
Diffstat (limited to 'src/libs/cplusplus/CppRewriter.cpp')
| -rw-r--r-- | src/libs/cplusplus/CppRewriter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp index 0dfa030cfc..e487efb0a0 100644 --- a/src/libs/cplusplus/CppRewriter.cpp +++ b/src/libs/cplusplus/CppRewriter.cpp @@ -550,7 +550,7 @@ CPLUSPLUS_EXPORT QString simplifySTLType(const QString &typeIn) simplifyStdString(QLatin1String("unsigned short"), QLatin1String("wstring"), &type); } // std::vector, std::deque, std::list - const QRegExp re1(QString::fromLatin1("(vector|list|deque)<%1, ?%2\\s*>").arg(inner, alloc)); + QRegExp re1(QString::fromLatin1("(vector|list|deque)<%1, ?%2\\s*>").arg(inner, alloc)); Q_ASSERT(re1.isValid()); if (re1.indexIn(type) != -1) type.replace(re1.cap(0), QString::fromLatin1("%1<%2>").arg(re1.cap(1), inner)); |