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/plugins/qmljstools | |
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/plugins/qmljstools')
-rw-r--r-- | src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmljstools/qmljsfunctionfilter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp index 9f9f66f373..07d459334f 100644 --- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp +++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp @@ -212,7 +212,7 @@ protected: } if (packageName.isEmpty() && _compound) { // check the comments in _compound for annotations - const QRegExp uriAnnotation(QLatin1String("@uri\\s*([\\w\\.]*)")); + QRegExp uriAnnotation(QLatin1String("@uri\\s*([\\w\\.]*)")); // scan every comment between the pipes in // {| diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp index b48f4c3bf8..e0e4fee825 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp +++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp @@ -70,7 +70,7 @@ QList<Locator::FilterEntry> FunctionFilter::matchesFor(QFutureInterface<Locator: QList<Locator::FilterEntry> betterEntries; const QChar asterisk = QLatin1Char('*'); QStringMatcher matcher(entry, Qt::CaseInsensitive); - const QRegExp regexp(asterisk + entry+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard); + QRegExp regexp(asterisk + entry+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard); if (!regexp.isValid()) return goodEntries; bool hasWildcard = (entry.contains(asterisk) || entry.contains('?')); |